Commit 0aacdfa3 authored by kdabholkar's avatar kdabholkar

changes of Offline Data sheet in HSN query(include nill rated , exempted transction in HSN).

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@184690 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c15f07c4
...@@ -4212,7 +4212,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -4212,7 +4212,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
+ " SUM(GDD.IGST_AMT) AS TOT_IAMT, SUM(CGST_AMT) AS TOT_CAMT, SUM(SGST_AMT) AS TOT_SAMT, SUM(CESS_AMT) AS TOT_CSAMT" + " SUM(GDD.IGST_AMT) AS TOT_IAMT, SUM(CGST_AMT) AS TOT_CAMT, SUM(SGST_AMT) AS TOT_SAMT, SUM(CESS_AMT) AS TOT_CSAMT"
+ " FROM GST_DATA_HDR GDH, GST_DATA_DET GDD, UOM U" + " FROM GST_DATA_HDR GDH, GST_DATA_DET GDD, UOM U"
+ " WHERE GDH.TRAN_ID = GDD.TRAN_ID AND GDD.GS_CODE IS NOT NULL AND GDH.REC_TYPE='1' AND GDD.UNIT=U.UNIT" + " WHERE GDH.TRAN_ID = GDD.TRAN_ID AND GDD.GS_CODE IS NOT NULL AND GDH.REC_TYPE='1' AND GDD.UNIT=U.UNIT"
+ " AND GDH.SITE_CODE = ? AND GDH.PRD_CODE = ? AND GDH.TRAN_TYPE NOT IN ('29','31','15','16','17','18','19','20','21','22','23','24','25','26')" + " AND GDH.SITE_CODE = ? AND GDH.PRD_CODE = ? AND GDH.TRAN_TYPE NOT IN ('29','31')"
+ " GROUP BY GDD.GS_CODE, GDD.UNIT, U.DESCR" + " GROUP BY GDD.GS_CODE, GDD.UNIT, U.DESCR"
+ " UNION ALL" + " UNION ALL"
+ " SELECT GDD.GS_CODE, GDD.UNIT, U.DESCR, -1*SUM(GDD.QUANTITY) AS TOT_QTY, -1*SUM(GDD.TAXABLE_AMT) AS TOT_TAXVAL," + " SELECT GDD.GS_CODE, GDD.UNIT, U.DESCR, -1*SUM(GDD.QUANTITY) AS TOT_QTY, -1*SUM(GDD.TAXABLE_AMT) AS TOT_TAXVAL,"
......
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