Skip to content

B
business-java
Commit c75e6ecb authored by kdabholkar's avatar kdabholkar
Browse files
Options

commited changes debit/Credit Note invoice value and taxable amount should show in INR. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@178546 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4bdfc7c7
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 12 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ c75e6ecb
...@@ -7260,7 +7260,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7260,7 +7260,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" i.conf_date as DOC_DATE, "*/ /*+" i.conf_date as DOC_DATE, "*/
// +"case when i.conf_date is null then i.tran_date else i.conf_date end as DOC_DATE," // +"case when i.conf_date is null then i.tran_date else i.conf_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
+" i.amount as AMOUNT, " // +" i.amount as AMOUNT, "
+" (i.amount * i.EXCH_RATE) as AMOUNT, "
+" 'N' as REVERSE_CHRG, " +" 'N' as REVERSE_CHRG, "
+" ' ' as LR_NO, " +" ' ' as LR_NO, "
// +" null as LR_DATE," commented by kaustubh 27 july 2017 // +" null as LR_DATE," commented by kaustubh 27 july 2017
...@@ -7353,7 +7354,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7353,7 +7354,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)), i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT // +" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)), i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT," //+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) * i.EXCH_RATE AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC," +" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT," +" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC," +" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC,"
...@@ -7365,7 +7368,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7365,7 +7368,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
else else
{ {
dtlSql = dtlSql + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE," dtlSql = dtlSql + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT," + "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, ' ', 'T') * i.EXCH_RATE as TAXABLE_AMT,"
// + "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC," + "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT," + "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC," + "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
...@@ -7498,7 +7503,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7498,7 +7503,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" i.conf_date as DOC_DATE, "*/ /*+" i.conf_date as DOC_DATE, "*/
// +"case when i.conf_date is null then i.tran_date else i.conf_date end as DOC_DATE," // +"case when i.conf_date is null then i.tran_date else i.conf_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
+" i.amount as AMOUNT, " // +" i.amount as AMOUNT, "
+" (i.amount * i.EXCH_RATE) as AMOUNT, "
+" 'N' as REVERSE_CHRG, " +" 'N' as REVERSE_CHRG, "
+" ' ' as LR_NO, " +" ' ' as LR_NO, "
// +" null as LR_DATE," commented by kaustubh 27 july 2017 // +" null as LR_DATE," commented by kaustubh 27 july 2017
...@@ -7589,7 +7595,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7589,7 +7595,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{ {
dtlSql = dtlSql +"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE," dtlSql = dtlSql +"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT," // +" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) * i.EXCH_RATE AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC," +" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT," +" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC," +" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC,"
...@@ -7601,7 +7609,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7601,7 +7609,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
else else
{ {
dtlSql = dtlSql + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE," dtlSql = dtlSql + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT," // + "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+" fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, ' ', 'T') * i.EXCH_RATE as TAXABLE_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC," + "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT," + "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC," + "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
...@@ -7818,7 +7828,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7818,7 +7828,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" i.conf_date as DOC_DATE, "*/ /*+" i.conf_date as DOC_DATE, "*/
// +"case when i.conf_date is null then i.tran_date else i.conf_date end as DOC_DATE," // +"case when i.conf_date is null then i.tran_date else i.conf_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
+" i.amount as AMOUNT, " // +" i.amount as AMOUNT, "
+" (i.amount * i.EXCH_RATE) as AMOUNT, "
+" 'N' as REVERSE_CHRG, " +" 'N' as REVERSE_CHRG, "
+" ' ' as LR_NO, " +" ' ' as LR_NO, "
// +" null as LR_DATE," commented by kaustubh 27 july 2017 // +" null as LR_DATE," commented by kaustubh 27 july 2017
...@@ -7897,7 +7908,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7897,7 +7908,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{ {
dtlSql = dtlSql +"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE," dtlSql = dtlSql +"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT," //+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) * i.EXCH_RATE AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC," +" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT," +" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC," +" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC,"
...@@ -7909,7 +7922,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7909,7 +7922,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
else else
{ {
dtlSql = dtlSql + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE," dtlSql = dtlSql + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT," // + "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+" fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, ' ', 'T') * i.EXCH_RATE as TAXABLE_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC," + "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT," + "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC," + "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
...@@ -8041,7 +8056,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -8041,7 +8056,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" i.conf_date as DOC_DATE, "*/ /*+" i.conf_date as DOC_DATE, "*/
// +"case when i.conf_date is null then i.tran_date else i.conf_date end as DOC_DATE," // +"case when i.conf_date is null then i.tran_date else i.conf_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
+" i.amount as AMOUNT, " // +" i.amount as AMOUNT, "
+" (i.amount * i.EXCH_RATE) as AMOUNT, "
+" 'N' as REVERSE_CHRG, " +" 'N' as REVERSE_CHRG, "
+" ' ' as LR_NO, " +" ' ' as LR_NO, "
// +" null as LR_DATE," commented by kaustubh 27 july 2017 // +" null as LR_DATE," commented by kaustubh 27 july 2017
...@@ -8122,7 +8138,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -8122,7 +8138,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{ {
dtlSql = dtlSql +"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE," dtlSql = dtlSql +"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT," //+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) * i.EXCH_RATE AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC," +" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT," +" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC," +" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC,"
...@@ -8134,7 +8152,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -8134,7 +8152,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
else else
{ {
dtlSql = dtlSql + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE," dtlSql = dtlSql + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT," // + "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+"fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, ' ', 'T') * i.EXCH_RATE as TAXABLE_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC," + "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT," + "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC," + "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment