Commit 7d18e17c authored by pchavan's avatar pchavan

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@199006 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e3051ea1
...@@ -26233,10 +26233,8 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -26233,10 +26233,8 @@ dtlSql = " select '' as TRAN_ID, "
+" and trim(c.tax_reg_2) <> 'UNREGISTER' " +" and trim(c.tax_reg_2) <> 'UNREGISTER' "
+" and (select count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code " +" and (select count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code "
+" and ti.tran_code = 'P-RCP' and ti.tran_id = i.tran_id " +" and ti.tran_code = 'P-RCP' and ti.tran_id = i.tran_id "
// changed by Priyankac As per the suggest by Gaurav. [START] +" and tm.TAX_GROUP IN ('ITC','NITC') "
//+" and tm.TAX_GROUP IN ('ITC','NITC') " //+" and tm.TAX_GROUP IN ('ITC') "
+" and tm.TAX_GROUP IN ('ITC') "
// changed by Priyankac As per the suggest by Gaurav. END
+" and Ti.Tax_Perc > 0 " //added on 20 june 2018 +" and Ti.Tax_Perc > 0 " //added on 20 june 2018
+" and tm.tax_type in ('G','H','I','J')"; +" and tm.tax_type in ('G','H','I','J')";
if(taxClassAllStrOfPurchase.length() > 0) if(taxClassAllStrOfPurchase.length() > 0)
...@@ -26335,10 +26333,8 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -26335,10 +26333,8 @@ dtlSql = " select '' as TRAN_ID, "
+" and item.item_code = it.item_code " +" and item.item_code = it.item_code "
+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code " +"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+"and ti.tran_code = 'P-RCP' " +"and ti.tran_code = 'P-RCP' "
//Changed by PriyankaC as per discuss with gaurav.[START] +" and tx.TAX_GROUP IN ('ITC','NITC') "
//+" and tx.TAX_GROUP IN ('ITC','NITC') " // +" and tx.TAX_GROUP IN ('ITC') "
+" and tx.TAX_GROUP IN ('ITC') "
//Changed by PriyankaC as per discuss with gaurav.[END]
+" and ti.tran_id = i.tran_id " +" and ti.tran_id = i.tran_id "
+" and ti.LINE_NO = it.LINE_NO " +" and ti.LINE_NO = it.LINE_NO "
+" and ti.TAX_PERC > 0 " +" and ti.TAX_PERC > 0 "
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