Commit a1ca50e8 authored by manohar's avatar manohar

bug fix


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@105119 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f7aa08f6
...@@ -1652,10 +1652,10 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1652,10 +1652,10 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
private String gbfPostInvoiceHdr(HashMap<String, String> InvoiceHrdMap,Connection conn) throws ITMException private String gbfPostInvoiceHdr(HashMap<String, String> InvoiceHrdMap,Connection conn) throws ITMException
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
String retSting="",sysDate="",lsPostdate="",sql="",lsProjCode="",partyDocRef="",lcCramt="",lsAnalysis="",lsTemp="",llRelAfter="",lsAmtType=""; String retSting="",sysDate="",lsPostdate="",sql="",lsProjCode="",partyDocRef="",lsAnalysis="",lsTemp="",llRelAfter="",lsAmtType="";
String analysis1__dr="",analysis2__dr="",analysis3__dr="",analysis1__cr="",analysis2__cr="",analysis3__cr="",sql1=""; String analysis1__dr="",analysis2__dr="",analysis3__dr="",analysis1__cr="",analysis2__cr="",analysis3__cr="",sql1="";
String lineNoRef=""; String lineNoRef="";
double lc_cramt=0.0,lc_dramt=0.0,lcSchemehdrAmt=0.0,lcRelAmt=0.0,lcTotAmt=0.0; double lcCramt=0.0,lc_dramt=0.0,lcSchemehdrAmt=0.0,lcRelAmt=0.0,lcTotAmt=0.0;
Timestamp ldDueDate=null; Timestamp ldDueDate=null;
PreparedStatement pstmt=null,pstmt1=null; PreparedStatement pstmt=null,pstmt1=null;
ResultSet rs=null,rs1=null; ResultSet rs=null,rs1=null;
...@@ -1795,7 +1795,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1795,7 +1795,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
//System.out.println("@@@@@@ remarksTemp["+remarksTemp+"]"); //System.out.println("@@@@@@ remarksTemp["+remarksTemp+"]");
glTraceMap.put("remarks", remarksTemp); glTraceMap.put("remarks", remarksTemp);
glTraceMap.put("proj_code", lsProjCode); glTraceMap.put("proj_code", lsProjCode);
lcCramt = 0;
//sql="select sum(case when tax_amt is null then 0 else tax_amt end) as lcCramt from taxtran where tran_code = 'S-INV'" //sql="select sum(case when tax_amt is null then 0 else tax_amt end) as lcCramt from taxtran where tran_code = 'S-INV'"
sql="select (case when sum(tax_amt) is null then 0 else sum(tax_amt) end) as lcCramt from taxtran where tran_code = 'S-INV'" sql="select (case when sum(tax_amt) is null then 0 else sum(tax_amt) end) as lcCramt from taxtran where tran_code = 'S-INV'"
+ " and tran_id = ? and effect <> 'N' and pay_tax = 'Y' "; + " and tran_id = ? and effect <> 'N' and pay_tax = 'Y' ";
...@@ -1804,7 +1804,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1804,7 +1804,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
lcCramt=checkNull(rs.getString("lcCramt")); lcCramt=rs.getDouble("lcCramt");
} }
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
...@@ -1813,10 +1813,9 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1813,10 +1813,9 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
//System.out.println("@@@@@@@1262 glTraceMap["+glTraceMap+"]"); //System.out.println("@@@@@@@1262 glTraceMap["+glTraceMap+"]");
if(lcCramt==null || lcCramt.trim().length()==0) if(lcCramt==0)
{ {
lc_cramt=0; lc_dramt=(Double)glTraceMap.get("dr_amt")-lcCramt;
lc_dramt=(Double)glTraceMap.get("dr_amt")-lc_cramt;
glTraceMap.put("dr_amt",lc_dramt); glTraceMap.put("dr_amt",lc_dramt);
} }
/** /**
...@@ -1824,12 +1823,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1824,12 +1823,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
* */ * */
retSting=finCommon.glTraceUpdate(glTraceMap,conn); retSting=finCommon.glTraceUpdate(glTraceMap,conn);
if(Math.abs(Double.parseDouble(lcCramt))>0) if(Math.abs(lcCramt) > 0)
{ {
glTraceMap.put("dr_amt",0); glTraceMap.put("dr_amt",0);
lc_cramt=(-1)*lc_cramt; lcCramt=(-1)*lcCramt;
glTraceMap.put("cr_amt",lc_cramt); glTraceMap.put("cr_amt",lcCramt);
/** /**
* gl_trace update * gl_trace update
......
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