Skip to content

B
business-java
Commit 402fed6a authored by msaggam's avatar msaggam
Browse files
Options

Invoice posting - cannot insert null for acct_code 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204422 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 486223f0
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 2 deletions
webitm-dis/ibase/webitm/ejb/dis/PostOrdInvoicePost.java
View file @ 402fed6a
...@@ -60,7 +60,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -60,7 +60,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
PreparedStatement pstmt=null,pstmtU=null,pstmt1=null,pstmt2=null; PreparedStatement pstmt=null,pstmtU=null,pstmt1=null,pstmt2=null;
ResultSet rs=null,rs1=null,rs2=null; ResultSet rs=null,rs1=null,rs2=null;
boolean connFlag=false; boolean connFlag=false;
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); // added by Mahesh Saggam on 29-07-2019
// TODO Auto-generated method stub // TODO Auto-generated method stub
HashMap<String, String> InvoiceHrdMap=new HashMap<String, String>(); HashMap<String, String> InvoiceHrdMap=new HashMap<String, String>();
...@@ -406,6 +406,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -406,6 +406,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
invAcctMap.put("invoice_id", detInvId); invAcctMap.put("invoice_id", detInvId);
//invAcctMap.put("line_no",detLineNo); //invAcctMap.put("line_no",detLineNo);
invAcctMap.put("acct_code", lsAcctCodeSal); invAcctMap.put("acct_code", lsAcctCodeSal);
if(lsAcctCodeSal == null || lsAcctCodeSal.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTSLACCT", "","", conn);
return retString;
}
invAcctMap.put("cctr_code", lsCctrCodeSal); invAcctMap.put("cctr_code", lsCctrCodeSal);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
invAcctMap.put("amount", ""+detAmount); invAcctMap.put("amount", ""+detAmount);
...@@ -452,6 +457,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -452,6 +457,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
invAcctMap.put("invoice_id", detInvId); invAcctMap.put("invoice_id", detInvId);
//invAcctMap.put("line_no",detLineNo); //invAcctMap.put("line_no",detLineNo);
invAcctMap.put("acct_code", lsAcctCodeDis); invAcctMap.put("acct_code", lsAcctCodeDis);
if(lsAcctCodeDis == null || lsAcctCodeDis.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTDISACCT", "","", conn);
return retString;
}
invAcctMap.put("cctr_code", lsCctrCodeDis); invAcctMap.put("cctr_code", lsCctrCodeDis);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
invAcctMap.put("amount", ""+lnAmountDis*(-1)); invAcctMap.put("amount", ""+lnAmountDis*(-1));
...@@ -479,6 +489,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -479,6 +489,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
invAcctMap.put("invoice_id", detInvId); invAcctMap.put("invoice_id", detInvId);
//invAcctMap.put("line_no",detLineNo); //invAcctMap.put("line_no",detLineNo);
invAcctMap.put("acct_code", lsAcctCodePr); invAcctMap.put("acct_code", lsAcctCodePr);
if(lsAcctCodePr == null || lsAcctCodePr.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTPRACCT", "","", conn);
return retString;
}
invAcctMap.put("cctr_code", lsCctrCodePr); invAcctMap.put("cctr_code", lsCctrCodePr);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
invAcctMap.put("amount", ""+lnAmountDis); invAcctMap.put("amount", ""+lnAmountDis);
...@@ -504,6 +519,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -504,6 +519,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
invAcctMap.put("invoice_id", detInvId); invAcctMap.put("invoice_id", detInvId);
//invAcctMap.put("line_no",detLineNo); //invAcctMap.put("line_no",detLineNo);
invAcctMap.put("acct_code", lsAcctCodePr); invAcctMap.put("acct_code", lsAcctCodePr);
if(lsAcctCodePr == null || lsAcctCodePr.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTPRACCT", "","", conn);
return retString;
}
invAcctMap.put("cctr_code", lsCctrCodePr); invAcctMap.put("cctr_code", lsCctrCodePr);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
invAcctMap.put("amount", InvoiceDetMap.get("disc_schem_billback_amt")); invAcctMap.put("amount", InvoiceDetMap.get("disc_schem_billback_amt"));
...@@ -561,6 +581,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -561,6 +581,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
invAcctMap.put("invoice_id", detInvId); invAcctMap.put("invoice_id", detInvId);
//invAcctMap.put("line_no",detLineNo); //invAcctMap.put("line_no",detLineNo);
invAcctMap.put("acct_code", lsAcctCodeTax); invAcctMap.put("acct_code", lsAcctCodeTax);
if(lsAcctCodeTax == null || lsAcctCodeTax.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTTXACCT", "","", conn);
return retString;
}
invAcctMap.put("cctr_code", lsCctrCodeTax); invAcctMap.put("cctr_code", lsCctrCodeTax);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
invAcctMap.put("amount", ""+lnAmountTax); invAcctMap.put("amount", ""+lnAmountTax);
...@@ -639,6 +664,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -639,6 +664,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
invAcctMap.put("invoice_id", detInvId); invAcctMap.put("invoice_id", detInvId);
//invAcctMap.put("line_no",detLineNo); //invAcctMap.put("line_no",detLineNo);
invAcctMap.put("acct_code", lsAcctReco); invAcctMap.put("acct_code", lsAcctReco);
if(lsAcctReco == null || lsAcctReco.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTRECACCT", "","", conn);
return retString;
}
invAcctMap.put("cctr_code", lsCctrReco); invAcctMap.put("cctr_code", lsCctrReco);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
invAcctMap.put("amount", ""+lcRecoAmt); invAcctMap.put("amount", ""+lcRecoAmt);
...@@ -736,7 +766,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -736,7 +766,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
invAcctMap.put("invoice_id", detInvId); invAcctMap.put("invoice_id", detInvId);
//invAcctMap.put("line_no",detLineNo); //invAcctMap.put("line_no",detLineNo);
invAcctMap.put("acct_code", lsAcctCodeSal); invAcctMap.put("acct_code", lsAcctCodeSal);
if(lsAcctCodeSal == null || lsAcctCodeSal.trim().length() == 0)// Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTSLACCT", "","", conn);
return retString;
}
invAcctMap.put("cctr_code", lsCctrCodeSal); invAcctMap.put("cctr_code", lsCctrCodeSal);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
invAcctMap.put("amount", ""+lnAmountSal); invAcctMap.put("amount", ""+lnAmountSal);
...@@ -779,6 +814,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -779,6 +814,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
invAcctMap.put("invoice_id", detInvId); invAcctMap.put("invoice_id", detInvId);
//invAcctMap.put("line_no",detLineNo); //invAcctMap.put("line_no",detLineNo);
invAcctMap.put("acct_code", lsAcctCodeDis); invAcctMap.put("acct_code", lsAcctCodeDis);
if(lsAcctCodeDis == null || lsAcctCodeDis.trim().length() == 0)// Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTDISACCT", "","", conn);
return retString;
}
invAcctMap.put("cctr_code", lsCctrCodeDis); invAcctMap.put("cctr_code", lsCctrCodeDis);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
invAcctMap.put("amount", ""+lnAmountDis); invAcctMap.put("amount", ""+lnAmountDis);
...@@ -832,6 +872,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -832,6 +872,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
invAcctMap.put("invoice_id", detInvId); invAcctMap.put("invoice_id", detInvId);
//invAcctMap.put("line_no",detLineNo); //invAcctMap.put("line_no",detLineNo);
invAcctMap.put("acct_code", lsAcctCodeTax); invAcctMap.put("acct_code", lsAcctCodeTax);
if(lsAcctCodeTax == null || lsAcctCodeTax.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTTXACCT", "","", conn);
return retString;
}
invAcctMap.put("cctr_code", lsCctrCodeTax); invAcctMap.put("cctr_code", lsCctrCodeTax);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
invAcctMap.put("amount", ""+lnAmountTax); invAcctMap.put("amount", ""+lnAmountTax);
...@@ -909,6 +954,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -909,6 +954,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
invAcctMap.put("invoice_id", detInvId); invAcctMap.put("invoice_id", detInvId);
//invAcctMap.put("line_no",detLineNo); //invAcctMap.put("line_no",detLineNo);
invAcctMap.put("acct_code", lsAcctReco); invAcctMap.put("acct_code", lsAcctReco);
if(lsAcctReco == null || lsAcctReco.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTRECACCT", "","", conn);
return retString;
}
invAcctMap.put("cctr_code", lsCctrReco); invAcctMap.put("cctr_code", lsCctrReco);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
invAcctMap.put("amount", ""+lcRecoAmt); invAcctMap.put("amount", ""+lcRecoAmt);
...@@ -977,6 +1027,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -977,6 +1027,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
//invAcctMap.put("line_no",detLineNo); //invAcctMap.put("line_no",detLineNo);
//invAcctMap.put("amount", ""+lnAmountTax); //invAcctMap.put("amount", ""+lnAmountTax);
invAcctMap.put("acct_code", ls_acct_code__radj); invAcctMap.put("acct_code", ls_acct_code__radj);
if(ls_acct_code__radj == null || ls_acct_code__radj.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTRADJACCT", "","", conn);
return retString;
}
invAcctMap.put("cctr_code", ls_cctr_code__radj); invAcctMap.put("cctr_code", ls_cctr_code__radj);
invAcctMap.put("amount",""+ ln_amount_radj); invAcctMap.put("amount",""+ ln_amount_radj);
invAcctMap.put("analysis1", lsAnalysis1); invAcctMap.put("analysis1", lsAnalysis1);
...@@ -1119,6 +1174,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1119,6 +1174,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
Timestamp sysDate=null; Timestamp sysDate=null;
HashMap sundryBalMap=null; HashMap sundryBalMap=null;
Timestamp ld_trandate=null,ld_effdate=null; Timestamp ld_trandate=null,ld_effdate=null;
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); // Added by Mahesh Saggam on 29-07-2019
try try
{ {
DistCommon distCommon = new DistCommon(); DistCommon distCommon = new DistCommon();
...@@ -1379,6 +1435,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1379,6 +1435,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
sundryBalMap.put("sundry_type", "C"); sundryBalMap.put("sundry_type", "C");
sundryBalMap.put("sundry_code", ls_cust_code); sundryBalMap.put("sundry_code", ls_cust_code);
sundryBalMap.put("acct_code", ls_acct_code); sundryBalMap.put("acct_code", ls_acct_code);
if(ls_acct_code == null || ls_acct_code.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTACCT", "","", conn);
return retString;
}
sundryBalMap.put("cctr_code", ls_cctr_code); sundryBalMap.put("cctr_code", ls_cctr_code);
sundryBalMap.put("curr_code", ls_curr_code); sundryBalMap.put("curr_code", ls_curr_code);
sundryBalMap.put("exch_rate", lc_exch_rate); sundryBalMap.put("exch_rate", lc_exch_rate);
...@@ -2138,11 +2199,13 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2138,11 +2199,13 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
String retString="",lsPostdate="",ldPostdate="",sql="",lsProjCode="",partyDocRef=""; String retString="",lsPostdate="",ldPostdate="",sql="",lsProjCode="",partyDocRef="";
String actCode = ""; // added by Mahesh Saggam
PreparedStatement pstmt=null; PreparedStatement pstmt=null;
ResultSet rs=null; ResultSet rs=null;
HashMap glTraceMap = null; HashMap glTraceMap = null;
HashMap<String, String>InvoiceAcctMap=null; HashMap<String, String>InvoiceAcctMap=null;
Timestamp ldPostdate2=null; Timestamp ldPostdate2=null;
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); // Added by Mahesh Saggam on 29/jul/2019
try try
{ {
lsPostdate=checkNull(finCommon.getFinparams("999999", "POST_DATE_INV", conn)); lsPostdate=checkNull(finCommon.getFinparams("999999", "POST_DATE_INV", conn));
...@@ -2207,6 +2270,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2207,6 +2270,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
glTraceMap.put("sundry_type","O"); glTraceMap.put("sundry_type","O");
glTraceMap.put("sundry_code"," "); glTraceMap.put("sundry_code"," ");
glTraceMap.put("acct_code",InvoiceAcctMap.get("acct_code")); glTraceMap.put("acct_code",InvoiceAcctMap.get("acct_code"));
actCode = InvoiceAcctMap.get("acct_code");
if(actCode == null || actCode.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retString = itmDBAccessEJB.getErrorString("", "VTACCT", "","", conn);
return retString;
}
glTraceMap.put("cctr_code",InvoiceAcctMap.get("cctr_code")); glTraceMap.put("cctr_code",InvoiceAcctMap.get("cctr_code"));
glTraceMap.put("anal_code",InvoiceAcctMap.get("anal_code")); glTraceMap.put("anal_code",InvoiceAcctMap.get("anal_code"));
glTraceMap.put("curr_code",InvoiceHrdMap.get("curr_code")); glTraceMap.put("curr_code",InvoiceHrdMap.get("curr_code"));
...@@ -2284,6 +2353,8 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2284,6 +2353,8 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
Timestamp ldDiscdt=null; Timestamp ldDiscdt=null;
Timestamp gpDateTstamp = null; Timestamp gpDateTstamp = null;
String gpDate=""; String gpDate="";
String actCode = ""; // added by Mahesh Saggam
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); // added by Mahesh Saggam on 29/jul/2019
try try
{ {
java.util.Date today = new java.util.Date(); java.util.Date today = new java.util.Date();
...@@ -2326,6 +2397,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2326,6 +2397,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
sundryBalMap.put("sundry_type", "C"); sundryBalMap.put("sundry_type", "C");
sundryBalMap.put("sundry_code", InvoiceHrdMap.get("cust_code__bil")); sundryBalMap.put("sundry_code", InvoiceHrdMap.get("cust_code__bil"));
sundryBalMap.put("acct_code", InvoiceHrdMap.get("acct_code__ar")); sundryBalMap.put("acct_code", InvoiceHrdMap.get("acct_code__ar"));
actCode = InvoiceHrdMap.get("acct_code__ar");
if(actCode == null || actCode.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retSting = itmDBAccessEJB.getErrorString("", "VTARACCT", "","", conn);
return retSting;
}
sundryBalMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__ar")); sundryBalMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__ar"));
sundryBalMap.put("curr_code", InvoiceHrdMap.get("curr_code")); sundryBalMap.put("curr_code", InvoiceHrdMap.get("curr_code"));
//sundryBalMap.put("exch_rate", InvoiceHrdMap.get("exch_rate")); //sundryBalMap.put("exch_rate", InvoiceHrdMap.get("exch_rate"));
...@@ -2387,6 +2464,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2387,6 +2464,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
glTraceMap.put("sundry_type", "C"); glTraceMap.put("sundry_type", "C");
glTraceMap.put("sundry_code", InvoiceHrdMap.get("cust_code__bil")); glTraceMap.put("sundry_code", InvoiceHrdMap.get("cust_code__bil"));
glTraceMap.put("acct_code", InvoiceHrdMap.get("acct_code__ar")); glTraceMap.put("acct_code", InvoiceHrdMap.get("acct_code__ar"));
actCode = InvoiceHrdMap.get("acct_code__ar");
if(actCode == null || actCode.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retSting = itmDBAccessEJB.getErrorString("", "VTARACCT", "","", conn);
return retSting;
}
glTraceMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__ar")); glTraceMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__ar"));
glTraceMap.put("anal_code", InvoiceHrdMap.get("anal_code")); glTraceMap.put("anal_code", InvoiceHrdMap.get("anal_code"));
glTraceMap.put("curr_code", InvoiceHrdMap.get("curr_code")); glTraceMap.put("curr_code", InvoiceHrdMap.get("curr_code"));
...@@ -2507,6 +2590,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2507,6 +2590,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
glTraceMap.put("sundry_code", ' '); glTraceMap.put("sundry_code", ' ');
glTraceMap.put("acct_code", InvoiceHrdMap.get("acc_code__order")); glTraceMap.put("acct_code", InvoiceHrdMap.get("acc_code__order"));
actCode = InvoiceHrdMap.get("acc_code__order");
if(actCode == null || actCode.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retSting = itmDBAccessEJB.getErrorString("", "VTORDACCT", "","", conn);
return retSting;
}
if(InvoiceHrdMap.get("cctr_code__sal")!=null && InvoiceHrdMap.get("cctr_code__sal").trim().length()>0) if(InvoiceHrdMap.get("cctr_code__sal")!=null && InvoiceHrdMap.get("cctr_code__sal").trim().length()>0)
{ {
glTraceMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__sal")); glTraceMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__sal"));
...@@ -2533,6 +2622,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2533,6 +2622,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
{ {
glTraceMap.put("sundry_code", ' '); glTraceMap.put("sundry_code", ' ');
glTraceMap.put("acct_code", InvoiceHrdMap.get("acct_code__pr")); glTraceMap.put("acct_code", InvoiceHrdMap.get("acct_code__pr"));
actCode = InvoiceHrdMap.get("acct_code__pr");
if(actCode == null || actCode.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retSting = itmDBAccessEJB.getErrorString("", "VTPRACCT", "","", conn);
return retSting;
}
glTraceMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__pr")); glTraceMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__pr"));
glTraceMap.put("dr_amt", 0); glTraceMap.put("dr_amt", 0);
glTraceMap.put("cr_amt", InvoiceHrdMap.get("disc_billback_amt_hdr")); glTraceMap.put("cr_amt", InvoiceHrdMap.get("disc_billback_amt_hdr"));
...@@ -2613,6 +2708,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2613,6 +2708,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
receivablesMap.put("exch_rate", InvoiceHrdMap.get("exch_rate")); receivablesMap.put("exch_rate", InvoiceHrdMap.get("exch_rate"));
receivablesMap.put("cust_code", InvoiceHrdMap.get("cust_code__bil")); receivablesMap.put("cust_code", InvoiceHrdMap.get("cust_code__bil"));
receivablesMap.put("acct_code", InvoiceHrdMap.get("acct_code__ar")); receivablesMap.put("acct_code", InvoiceHrdMap.get("acct_code__ar"));
actCode = InvoiceHrdMap.get("acct_code__ar");
if(actCode == null || actCode.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retSting = itmDBAccessEJB.getErrorString("", "VTARACCT", "","", conn);
return retSting;
}
receivablesMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__ar")); receivablesMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__ar"));
receivablesMap.put("tax_amt", InvoiceHrdMap.get("tax_amt")); receivablesMap.put("tax_amt", InvoiceHrdMap.get("tax_amt"));
receivablesMap.put("discount", InvoiceHrdMap.get("disc_amt")); receivablesMap.put("discount", InvoiceHrdMap.get("disc_amt"));
...@@ -2686,6 +2787,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2686,6 +2787,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
receivablesMap.put("exch_rate", InvoiceHrdMap.get("exch_rate")); receivablesMap.put("exch_rate", InvoiceHrdMap.get("exch_rate"));
receivablesMap.put("cust_code", InvoiceHrdMap.get("cust_code__bil")); receivablesMap.put("cust_code", InvoiceHrdMap.get("cust_code__bil"));
receivablesMap.put("acct_code", InvoiceHrdMap.get("acct_code__ar")); receivablesMap.put("acct_code", InvoiceHrdMap.get("acct_code__ar"));
actCode = InvoiceHrdMap.get("acct_code__ar");
if(actCode == null || actCode.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{
retSting = itmDBAccessEJB.getErrorString("", "VTARACCT", "","", conn);
return retSting;
}
receivablesMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__ar")); receivablesMap.put("cctr_code", InvoiceHrdMap.get("cctr_code__ar"));
receivablesMap.put("tax_amt", InvoiceHrdMap.get("tax_amt")); receivablesMap.put("tax_amt", InvoiceHrdMap.get("tax_amt"));
receivablesMap.put("discount", InvoiceHrdMap.get("disc_amt")); receivablesMap.put("discount", InvoiceHrdMap.get("disc_amt"));
......
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