Commit 2b89b615 authored by manohar's avatar manohar

quantity__stduom and rate__stduom set before calling tax calculation


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91489 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2a7c070e
...@@ -1376,7 +1376,10 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea ...@@ -1376,7 +1376,10 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
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(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); taxAmt = Double.parseDouble(taxAmount);
writeLog(filePtr,"Calculated taxAmt::: "+taxAmt,true); writeLog(filePtr,"Calculated taxAmt::: "+taxAmt,true);
...@@ -1603,6 +1606,18 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea ...@@ -1603,6 +1606,18 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
}//generateTranTd() }//generateTranTd()
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
{
handleTax(tranId,lineNo, tranDate, quantity, rate, currCode, siteCode, ctr, taxClass, taxChap, taxEnv, rateClg, discount, contractNo, lineNoContr, conn, quantity, rate);
}
catch(Exception e)
{
writeLog(filePtr,e,true);
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
{ {
StringBuffer valueXmlString =null; StringBuffer valueXmlString =null;
try try
...@@ -1625,6 +1640,10 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea ...@@ -1625,6 +1640,10 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
valueXmlString.append("<tax_amt>").append("0").append("</tax_amt>"); valueXmlString.append("<tax_amt>").append("0").append("</tax_amt>");
valueXmlString.append("<discount>").append(discount).append("</discount>"); valueXmlString.append("<discount>").append(discount).append("</discount>");
valueXmlString.append("<quantity>").append(quantity).append("</quantity>"); valueXmlString.append("<quantity>").append(quantity).append("</quantity>");
// 04/10/11 manoharan
valueXmlString.append("<quantity__stduom>").append(qtyStdUom).append("</quantity__stduom>");
valueXmlString.append("<rate__stduom>").append(rateStdUom).append("</rate__stduom>");
// end 04/10/11 manoharan
valueXmlString.append("<contract_no>").append(contractNo).append("</contract_no>"); valueXmlString.append("<contract_no>").append(contractNo).append("</contract_no>");
valueXmlString.append("<line_no__contr>").append(lineNoContr).append("</line_no__contr>"); valueXmlString.append("<line_no__contr>").append(lineNoContr).append("</line_no__contr>");
valueXmlString.append("<Taxes/>"); valueXmlString.append("<Taxes/>");
......
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