Skip to content

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

commit following changes 

1) exclude cancelled D-ISS and D-RCP from GST
2) added new condition in B2CL query of GSTR1 for tax_env 
  

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@192653 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6902a62f
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 12 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ 5c85873c
...@@ -771,8 +771,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -771,8 +771,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" where c.site_code = i.site_code" +" where c.site_code = i.site_code"
+" and s.site_code = c.site_code" +" and s.site_code = c.site_code"
+" and state.state_code = c.STATE_CODE " +" and state.state_code = c.STATE_CODE "
+"and d.site_code= i.site_code__dlv " +" and d.site_code= i.site_code__dlv "
+"and st.state_code = d.state_code " +" and st.state_code = d.state_code "
+" and trim(i.confirmed) <> 'X' "
// +"and st.state_code <> state.state_code " CHANGED ON 29 AUG done following changes After discussion with OM // +"and st.state_code <> state.state_code " CHANGED ON 29 AUG done following changes After discussion with OM
+"AND ((st.state_code <> state.state_code) or ((st.state_code = state.state_code) and (s.fin_entity <> d.fin_entity)))" +"AND ((st.state_code <> state.state_code) or ((st.state_code = state.state_code) and (s.fin_entity <> d.fin_entity)))"
//+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id "; //+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id ";
...@@ -1758,6 +1759,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -1758,6 +1759,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
hdrSql = hdrSql hdrSql = hdrSql
+" and (select count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_code = 'S-INV' " +" and (select count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_code = 'S-INV' "
+" and ti.tran_id = i.invoice_id and tm.tax_type in ('I','J') " +" and ti.tran_id = i.invoice_id and tm.tax_type in ('I','J') "
+" AND trim(ti.tax_env) NOT IN ('SEP01') "
+" and ti.tax_perc <> 0 "; +" and ti.tax_perc <> 0 ";
if(taxClassAllStr.length() > 0) if(taxClassAllStr.length() > 0)
{ {
...@@ -3898,8 +3900,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -3898,8 +3900,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" where c.site_code = i.site_code" +" where c.site_code = i.site_code"
+" and s.site_code = c.site_code" +" and s.site_code = c.site_code"
+" and state.state_code = c.STATE_CODE " +" and state.state_code = c.STATE_CODE "
+"and d.site_code= i.site_code__dlv " +" and d.site_code= i.site_code__dlv "
+"and st.state_code = d.state_code " +" and st.state_code = d.state_code "
+" and trim(i.confirmed) <> 'X' "
//+"and st.state_code = state.state_code " //+"and st.state_code = state.state_code "
+" and ((st.state_code = state.state_code) AND (s.fin_entity = d.fin_entity)) " +" and ((st.state_code = state.state_code) AND (s.fin_entity = d.fin_entity)) "
+" and (select count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_code = 'D-ISS' " +" and (select count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_code = 'D-ISS' "
...@@ -17670,6 +17673,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -17670,6 +17673,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and state.state_code = c.STATE_CODE " +" and state.state_code = c.STATE_CODE "
+" and d.site_code= i.site_code__ship " +" and d.site_code= i.site_code__ship "
+" and st.state_code = d.state_code " +" and st.state_code = d.state_code "
+" and trim(i.confirmed) <> 'X' "
// +" and st.state_code <> state.state_code " // +" and st.state_code <> state.state_code "
+" AND ((st.state_code <> state.state_code) or ((st.state_code = state.state_code) and (s.fin_entity <> d.fin_entity)))" +" AND ((st.state_code <> state.state_code) or ((st.state_code = state.state_code) and (s.fin_entity <> d.fin_entity)))"
//+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id "; //+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id ";
...@@ -21703,8 +21707,9 @@ hdrSql = " select '' as TRAN_ID," ...@@ -21703,8 +21707,9 @@ hdrSql = " select '' as TRAN_ID,"
+" where c.site_code = i.site_code" +" where c.site_code = i.site_code"
+" and s.site_code = c.site_code" +" and s.site_code = c.site_code"
+" and state.state_code = c.STATE_CODE " +" and state.state_code = c.STATE_CODE "
+"and d.site_code= i.site_code__ship " +" and d.site_code= i.site_code__ship "
+"and st.state_code = d.state_code " +" and st.state_code = d.state_code "
+" and trim(i.confirmed) <> 'X' "
//+"and st.state_code = state.state_code " //+"and st.state_code = state.state_code "
// +" and ((st.state_code = state.state_code) AND (s.fin_entity = d.fin_entity)) " // +" and ((st.state_code = state.state_code) AND (s.fin_entity = d.fin_entity)) "
//+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id "; //+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id ";
...@@ -21883,8 +21888,9 @@ hdrSql = " select '' as TRAN_ID," ...@@ -21883,8 +21888,9 @@ hdrSql = " select '' as TRAN_ID,"
+" where c.site_code = i.site_code" +" where c.site_code = i.site_code"
+" and s.site_code = c.site_code" +" and s.site_code = c.site_code"
+" and state.state_code = c.STATE_CODE " +" and state.state_code = c.STATE_CODE "
+"and d.site_code= i.site_code__ship " +" and d.site_code= i.site_code__ship "
+"and st.state_code = d.state_code " +" and st.state_code = d.state_code "
+" and trim(i.confirmed) <> 'X' "
//+"and st.state_code = state.state_code " //+"and st.state_code = state.state_code "
// +" and ((st.state_code = state.state_code) AND (s.fin_entity = d.fin_entity)) " // +" and ((st.state_code = state.state_code) AND (s.fin_entity = d.fin_entity)) "
//+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id "; //+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id ";
...@@ -25831,8 +25837,9 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -25831,8 +25837,9 @@ dtlSql = " select '' as TRAN_ID, "
+" where c.site_code = i.site_code" +" where c.site_code = i.site_code"
+" and s.site_code = c.site_code" +" and s.site_code = c.site_code"
+" and state.state_code = c.STATE_CODE " +" and state.state_code = c.STATE_CODE "
+"and d.site_code= i.site_code__ship " +" and d.site_code= i.site_code__ship "
+"and st.state_code = d.state_code " +" and st.state_code = d.state_code "
+" and trim(i.confirmed) <> 'X' "
// +"and st.state_code <> state.state_code " // +"and st.state_code <> state.state_code "
+"AND ((st.state_code <> state.state_code) or ((st.state_code = state.state_code) and (s.fin_entity <> d.fin_entity)))" +"AND ((st.state_code <> state.state_code) or ((st.state_code = state.state_code) and (s.fin_entity <> d.fin_entity)))"
//+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id "; //+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id ";
...@@ -34641,8 +34648,9 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -34641,8 +34648,9 @@ dtlSql = " select '' as TRAN_ID, "
+" where c.site_code = i.site_code" +" where c.site_code = i.site_code"
+" and s.site_code = c.site_code" +" and s.site_code = c.site_code"
+" and state.state_code = c.STATE_CODE " +" and state.state_code = c.STATE_CODE "
+"and d.site_code= i.site_code__ship " +" and d.site_code= i.site_code__ship "
+"and st.state_code = d.state_code " +" and st.state_code = d.state_code "
+" and trim(i.confirmed) <> 'X' "
//+"and st.state_code = state.state_code " //+"and st.state_code = state.state_code "
// +" and ((st.state_code = state.state_code) AND (s.fin_entity = d.fin_entity)) " // +" and ((st.state_code = state.state_code) AND (s.fin_entity = d.fin_entity)) "
//+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id "; //+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id ";
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