Commit 07a51cf7 authored by ajadhav's avatar ajadhav

tax cal changes

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177368 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 031e60a3
...@@ -1382,26 +1382,33 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea ...@@ -1382,26 +1382,33 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
//Changes and Commented By Ajay on 29-12-2017:START
//handleTax(saleOrder,row,tranDate.toString(),relQty,rate,currCode,siteCode,row,taxClass,taxChap,taxEnv,rateClg,discount,contractNo,line_No,conn); //handleTax(saleOrder,row,tranDate.toString(),relQty,rate,currCode,siteCode,row,taxClass,taxChap,taxEnv,rateClg,discount,contractNo,line_No,conn);
pstmt.setDouble(12,qtyStuom); pstmt.setDouble(12,qtyStuom);
pstmt.setDouble(13,rateStduom); pstmt.setDouble(13,rateStduom);
handleTax(saleOrder,row,tranDate.toString(),relQty,rate,currCode,siteCode,row,taxClass,taxChap,taxEnv,rateClg,discount,contractNo,line_No,conn,qtyStuom,rateStduom);
taxAmt = Double.parseDouble(taxAmount); //handleTax(saleOrder,row,tranDate.toString(),relQty,rate,currCode,siteCode,row,taxClass,taxChap,taxEnv,rateClg,discount,contractNo,line_No,conn,qtyStuom,rateStduom);
writeLog(filePtr,"Calculated taxAmt::: "+taxAmt,true); //taxAmt = Double.parseDouble(taxAmount);
//writeLog(filePtr,"Calculated taxAmt::: "+taxAmt,true);
pstmt.setDouble(24,taxAmt); writeLog(filePtr,"Calculated taxAmt::: "+0.0,true);
//pstmt.setDouble(24,taxAmt);
pstmt.setDouble(24,0.0);
pstmt.setDouble(25,noArt); pstmt.setDouble(25,noArt);
pstmt.setDouble(26,rateClg); pstmt.setDouble(26,rateClg);
double netAmt = 0.0; double netAmt = 0.0;
totAmt = (qtyStuom * rateStduom); totAmt = (qtyStuom * rateStduom);
totAmt = ((totAmt - ((totAmt * discount) / 100)) + taxAmt); //totAmt = ((totAmt - ((totAmt * discount) / 100)) + taxAmt);
totAmt = ((totAmt - ((totAmt * discount) / 100)) + 0.0);
netAmt = totAmt; netAmt = totAmt;
pstmt.setDouble(27,netAmt); pstmt.setDouble(27,netAmt);
pstmt.setString(28,contractNo); pstmt.setString(28,contractNo);
totAmtHdr = totAmtHdr + netAmt; totAmtHdr = totAmtHdr + netAmt;
taxAmtHdr = taxAmtHdr + taxAmt; //taxAmtHdr = taxAmtHdr + taxAmt;
taxAmtHdr = taxAmtHdr + 0.0;
//Changes and Commented By Ajay on 29-12-2017:END
// 09-08-2006 manoharan // 09-08-2006 manoharan
pstmt.setTimestamp(29,dspDate); pstmt.setTimestamp(29,dspDate);
// end 09-08-2006 // end 09-08-2006
...@@ -1613,6 +1620,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea ...@@ -1613,6 +1620,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
return tranId; return tranId;
}//generateTranTd() }//generateTranTd()
// Commented By Ajay on 29-12-2017:START
/*
private void handleTax(String tranId,int lineNo,String tranDate,double quantity,double rate, String currCode,String siteCode,int ctr,String taxClass,String taxChap,String taxEnv,double rateClg,double discount,String contractNo, String lineNoContr, Connection conn)throws Exception private void handleTax(String tranId,int lineNo,String tranDate,double quantity,double rate, String currCode,String siteCode,int ctr,String taxClass,String taxChap,String taxEnv,double rateClg,double discount,String contractNo, String lineNoContr, Connection conn)throws Exception
{ {
try try
...@@ -1625,7 +1634,7 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea ...@@ -1625,7 +1634,7 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
throw new ITMException(e); throw new ITMException(e);
} }
} }
private void handleTax(String tranId,int lineNo,String tranDate,double quantity,double rate, String currCode,String siteCode,int ctr,String taxClass,String taxChap,String taxEnv,double rateClg,double discount,String contractNo, String lineNoContr, Connection conn, double qtyStdUom, double rateStdUom)throws Exception */ /*private void handleTax(String tranId,int lineNo,String tranDate,double quantity,double rate, String currCode,String siteCode,int ctr,String taxClass,String taxChap,String taxEnv,double rateClg,double discount,String contractNo, String lineNoContr, Connection conn, double qtyStdUom, double rateStdUom)throws Exception
{ {
StringBuffer valueXmlString =null; StringBuffer valueXmlString =null;
try try
...@@ -1717,6 +1726,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea ...@@ -1717,6 +1726,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
throw new ITMException(e); throw new ITMException(e);
} }
} }
*/
//Commented By Ajay on 29-12-2017:END
private void appendOrReplaceTaxesNode(Node currRecordNode)throws ITMException private void appendOrReplaceTaxesNode(Node currRecordNode)throws ITMException
{ {
boolean found = false; boolean found = false;
......
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