git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190615 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java

@@ -9761,8 +9761,13 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									//  +" and inv.conf_date  < '"+currMonthStartDate+"' "      commented by kaustubh on 27 july
 									
 									  +" and trim(c.tax_reg_2) = 'UNREGISTER' " 
-									  +" AND (SELECT COUNT(1) FROM taxtran ti WHERE ti.tran_code = 'CRNRCP' AND ti.tran_id = i.tran_id AND ti.tax_perc <> 0" + 
-									  "  AND (ti.tax_class not IN ('NIL')  OR ti.tax_chap    not IN ('GST-NIL','SER-NIL') ) ) > 0"
+									  +" AND (SELECT COUNT(1) FROM taxtran ti WHERE ti.tran_code = 'CRNRCP' AND ti.tran_id = i.tran_id AND ti.tax_perc <> 0";
+									  if(GST_NIL_TAXCLASS.length() > 0)
+									  {
+										  hdrSql = hdrSql +" and ti.tax_class not in ("+GST_NIL_TAXCLASS+") or ti.tax_chap not in ("+ TAX_CHAP_STR +"  ) ) > 0";
+									  }
+									  hdrSql = hdrSql
+									 // +  "  AND (ti.tax_class not IN ('NIL')  OR ti.tax_chap    not IN ('GST-NIL','SER-NIL') ) ) > 0"
 									  +" and (i.cust_code not in (select distinct invoice.cust_code from invoice,customer " 
 									  +" where invoice.cust_code = customer.cust_code and invoice.net_amt <= "+GST_B2CL_INV_VAL+" and trim(c.TAX_REG_2) = 'UNREGISTER'))"
 									  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
@@ -10000,8 +10005,13 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									//  +" and inv.conf_date  < '"+currMonthStartDate+"' "      commented by kaustubh on 27 july 2017
 									//+" and inv.tran_date  < '"+currMonthStartDate+"' "        changed by kaustubh on 31 july 2017
 									  +" and trim(c.tax_reg_2) = 'UNREGISTER' " 
-									   +" AND (SELECT COUNT(1) FROM taxtran ti WHERE ti.tran_code = 'DRNRCP' AND ti.tran_id = i.tran_id AND ti.tax_perc <> 0" + 
-									  "  AND (ti.tax_class not IN ('NIL')  OR ti.tax_chap    not IN ('GST-NIL','SER-NIL') ) ) > 0"
+									   +" AND (SELECT COUNT(1) FROM taxtran ti WHERE ti.tran_code = 'DRNRCP' AND ti.tran_id = i.tran_id AND ti.tax_perc <> 0";
+									   if(GST_NIL_TAXCLASS.length() > 0)
+										  {
+											  hdrSql = hdrSql +" and ti.tax_class not in ("+GST_NIL_TAXCLASS+") or ti.tax_chap not in ("+ TAX_CHAP_STR +"  ) ) > 0";
+										  }
+										  hdrSql = hdrSql
+									//  "  AND (ti.tax_class not IN ('NIL')  OR ti.tax_chap    not IN ('GST-NIL','SER-NIL') ) ) > 0"
 									  +" and (i.cust_code not in (select distinct invoice.cust_code from invoice,customer " 
 									  +" where invoice.cust_code = customer.cust_code and invoice.net_amt <= "+GST_B2CL_INV_VAL+"and trim(c.TAX_REG_2) = 'UNREGISTER'))"
 									  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "