Skip to content

B
business-java
Commit bf8a8e79 authored by smanohar's avatar smanohar
Browse files
Options

Account to be debited for tax amount to MRA account corrected 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@211996 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 337a5b02
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 13 deletions
webitm-fin/src/ibase/webitm/ejb/fin/adv/VoucherConf.java
View file @ bf8a8e79
...@@ -266,11 +266,11 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -266,11 +266,11 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
double discAmt =0,foundAmt =0,rndAmt =0, netAmt=0, roundTo =0, netAmtActual =0, netAmtBc= 0,decQty =0, taxAmt = 0; double discAmt =0,foundAmt =0,rndAmt =0, netAmt=0, roundTo =0, netAmtActual =0, netAmtBc= 0,decQty =0, taxAmt = 0;
double rcpQty =0, vouchQty=0, stdRate=0, stdAmt=0, actualAmt=0, diffAmt=0,rcpRate=0,quantity=0,uomRoundVariance=0,quantityStduom=0,rcpTaxAmt=0; double rcpQty =0, vouchQty=0, stdRate=0, stdAmt=0, actualAmt=0, diffAmt=0,rcpRate=0,quantity=0,uomRoundVariance=0,quantityStduom=0,rcpTaxAmt=0;
double totRecoAmt=0, recoAmt=0, taxDiff=0, rcpMra=0, nonPayable=0, mraPPV=0, addCost=0; double totRecoAmt=0, recoAmt=0, taxDiff=0, rcpMra=0, nonPayable=0, mraPPV=0, addCost=0;
double rate =0,rateStduom=0,totDiscAmt = 0; double rate =0,rateStduom=0,totDiscAmt = 0, vouchTaxAmt = 0;
String unit="",unitRate="",uomRoundVarAcct="" , lineNoTax=""; String unit="",unitRate="",uomRoundVarAcct="" , lineNoTax="";
int voucCount = 0, porcpCount = 0,updCount = 0; int voucCount = 0, porcpCount = 0,updCount = 0;
double balance = 0,advAdj = 0; double balance = 0,advAdj = 0, porcpReco = 0;
java.sql.Timestamp today = null, rcpTranDate = null, rcpEffDate = null, rcpInvDate = null, rcpRecDate = null, rcpLrDate = null,dueDate = null; java.sql.Timestamp today = null, rcpTranDate = null, rcpEffDate = null, rcpInvDate = null, rcpRecDate = null, rcpLrDate = null,dueDate = null;
java.util.Date date = null; java.util.Date date = null;
...@@ -767,6 +767,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -767,6 +767,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
discAmt = rs1.getDouble("disc_amt"); discAmt = rs1.getDouble("disc_amt");
acctCodePh = rs1.getString("acct_code"); acctCodePh = rs1.getString("acct_code");
analCode = rs1.getString("anal_code");//Added by Yogesh 28/08/05 analCode = rs1.getString("anal_code");//Added by Yogesh 28/08/05
cctrCodePh = rs1.getString("cctr_code"); cctrCodePh = rs1.getString("cctr_code");
deptCode = rs1.getString("dept_code");//added by sandip 28/05/05 deptCode = rs1.getString("dept_code");//added by sandip 28/05/05
...@@ -777,7 +778,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -777,7 +778,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
projCode = rs1.getString("proj_code");//code added by ajit on date 07-oct-2016 projCode = rs1.getString("proj_code");//code added by ajit on date 07-oct-2016
rs1.getDouble("tax_amt"); vouchTaxAmt = rs1.getDouble("tax_amt"); // added by pravin 03/06/2016 tax_amt taken for subtract mra amount
if (acctCodePh == null ||acctCodePh.trim().length() == 0 ) if (acctCodePh == null ||acctCodePh.trim().length() == 0 )
{ {
//cctrCodePh = gbf_acct_detr(itemCode,itemSer, 'IN') // commented by manoharan 14-nov-2018 //cctrCodePh = gbf_acct_detr(itemCode,itemSer, 'IN') // commented by manoharan 14-nov-2018
...@@ -788,7 +789,8 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -788,7 +789,8 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
cctrCodePh = cctrCodePh.substring(cctrCodePh.indexOf(",")+1); cctrCodePh = cctrCodePh.substring(cctrCodePh.indexOf(",")+1);
} }
} }
System.out.println("Account 1 acctCodePh [" + acctCodePh + "]");
//added by sandip 28/05/05 //added by sandip 28/05/05
if (deptCode == null || deptCode.trim().length() == 0 ) if (deptCode == null || deptCode.trim().length() == 0 )
{ {
...@@ -952,7 +954,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -952,7 +954,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
rs.getDouble("reco_amount"); porcpReco = rs.getDouble("reco_amount");
} }
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
...@@ -978,7 +980,10 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -978,7 +980,10 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
pstmt = null; pstmt = null;
rs.close(); rs.close();
rs = null; rs = null;
if (vouchTaxAmt ==0)
{
nonPayable = 0;
}
// shiri 02/06/06 commented below to remove the reco amt, as it is not to be subtracted for mra provision // shiri 02/06/06 commented below to remove the reco amt, as it is not to be subtracted for mra provision
// rcpMra = rcpMra - porcpReco - nonPayable // rcpMra = rcpMra - porcpReco - nonPayable
//shiri 05/06/06 addeded disc_amt. as it is later posted to mra a/c and therfore gets subtracted //shiri 05/06/06 addeded disc_amt. as it is later posted to mra a/c and therfore gets subtracted
...@@ -1006,6 +1011,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1006,6 +1011,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
acctCodeDisc = cctrCodeDisc.substring(0,cctrCodeDisc.indexOf(",")); acctCodeDisc = cctrCodeDisc.substring(0,cctrCodeDisc.indexOf(","));
cctrCodeDisc = cctrCodeDisc.substring(cctrCodeDisc.indexOf(",")+1); cctrCodeDisc = cctrCodeDisc.substring(cctrCodeDisc.indexOf(",")+1);
} }
System.out.println("Account 2 acctCodePh [" + acctCodePh + "] rcpAmt [" +rcpAmt + "]");
////////////////////////////////////////// //////////////////////////////////////////
if (cctrCodePh == null ) if (cctrCodePh == null )
{ {
...@@ -1093,6 +1099,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1093,6 +1099,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
errString = getMsg(" Recovery account not defined for tranType [" +tranType + "] itemSer [" + itemSer + "]","VTACCTRECO", conn); errString = getMsg(" Recovery account not defined for tranType [" +tranType + "] itemSer [" + itemSer + "]","VTACCTRECO", conn);
break; break;
} }
System.out.println("Account 3 acctReco [" + acctReco + "] recoAmt[" + recoAmt +"]");
if (cctrReco == null || cctrReco.trim().length() == 0) if (cctrReco == null || cctrReco.trim().length() == 0)
{ {
cctrReco = cctrCodePh; cctrReco = cctrCodePh;
...@@ -1229,6 +1236,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1229,6 +1236,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
cctrCodeDiff = cctrCodeDiff.substring(cctrCodeDiff.indexOf(",")+1); cctrCodeDiff = cctrCodeDiff.substring(cctrCodeDiff.indexOf(",")+1);
} }
} }
System.out.println("Account 4 acctCodeDiff [" + acctCodeDiff + "] diffAmt [" + diffAmt + "]");
// If ACCT Code is NULL/SPACE Then Exit // If ACCT Code is NULL/SPACE Then Exit
if (cctrCodeDiff == null || cctrCodeDiff.trim().length() == 0) if (cctrCodeDiff == null || cctrCodeDiff.trim().length() == 0)
{ {
...@@ -1301,6 +1309,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1301,6 +1309,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
// uncommented by shiri 05/05/06 // uncommented by shiri 05/05/06
acctCodeDisc = acctCodePh; acctCodeDisc = acctCodePh;
cctrCodeDisc = cctrCodePh; cctrCodeDisc = cctrCodePh;
System.out.println("Account 5 acctCodeDisc [" + acctCodeDisc + "] discAmt [" + discAmt + "]");
// shiri 05/06/06 commented below and uncommented above 2 lines as disc posting is not reqd to separate a/c // shiri 05/06/06 commented below and uncommented above 2 lines as disc posting is not reqd to separate a/c
//if isnull(acctCodeDisc) or len(trim(acctCodeDisc)) = 0 then //if isnull(acctCodeDisc) or len(trim(acctCodeDisc)) = 0 then
// if hVouchType = 'A' then // if hVouchType = 'A' then
...@@ -1486,6 +1495,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1486,6 +1495,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
discAmt = uomRoundVariance; discAmt = uomRoundVariance;
totDiscAmt = totDiscAmt + discAmt; totDiscAmt = totDiscAmt + discAmt;
acctCodeDisc = uomRoundVarAcct; acctCodeDisc = uomRoundVarAcct;
System.out.println("Account 6 acctCodeDisc [" + acctCodeDisc + "] uomRoundVariance [" + uomRoundVariance + "]");
cctrCodeDisc = cctrCodePh; cctrCodeDisc = cctrCodePh;
if (cctrCodeDisc == null) if (cctrCodeDisc == null)
{ {
...@@ -1571,7 +1581,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1571,7 +1581,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
pstmt = null; pstmt = null;
lineCount = lineCount + liTax; lineCount = lineCount + liTax;
if (acctCodePh != null && acctCodePh.trim().length() > 0) if (acctCodePh == null || acctCodePh.trim().length() == 0)
{ {
cctrCodePh = finCommon.getAcctDetrTtype(itemCode, itemSer, "IN", tranType, siteCode, conn); cctrCodePh = finCommon.getAcctDetrTtype(itemCode, itemSer, "IN", tranType, siteCode, conn);
if (cctrCodePh != null && cctrCodePh.trim().length() > 0) if (cctrCodePh != null && cctrCodePh.trim().length() > 0)
...@@ -1580,7 +1590,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1580,7 +1590,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
cctrCodePh = cctrCodePh.substring(cctrCodePh.indexOf(",")+1); cctrCodePh = cctrCodePh.substring(cctrCodePh.indexOf(",")+1);
} }
} }
System.out.println("Account 7 acctCodePh [" + acctCodePh + "]");
// shiri 20/12/01 clause for effect <> 'N' // shiri 20/12/01 clause for effect <> 'N'
//changed by Rajkumar- 30-Mar-2005 for nvl //changed by Rajkumar- 30-Mar-2005 for nvl
// select sum(a.tax_amt), a.acct_code, a.cctr_code, sum(nvl(a.reco_amount,0)) // select sum(a.tax_amt), a.acct_code, a.cctr_code, sum(nvl(a.reco_amount,0))
...@@ -1652,14 +1662,18 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1652,14 +1662,18 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
acctCodePh = rs.getString("acct_code"); //acctCodePh = rs.getString("acct_code");
acctCodeTax = rs.getString("acct_code");
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//If acct_tax in null then get acct_ph from itemser //If acct_tax in null then get acct_ph from itemser
acctCodeTax = acctCodePh; if (acctCodeTax == null || acctCodeTax.trim().length() == 0)
{
acctCodeTax = acctCodePh;
}
} }
// End by GSoni. // End by GSoni.
} }
...@@ -1684,14 +1698,18 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1684,14 +1698,18 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
cctrCodePh = rs.getString("cctr_code"); //cctrCodePh = rs.getString("cctr_code");
cctrCodeTax = rs.getString("cctr_code");
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//If cctr_tax in null then get cctr_ph from itemser //If cctr_tax in null then get cctr_ph from itemser
cctrCodeTax = cctrCodePh; if (cctrCodeTax == null || cctrCodeTax.trim().length() == 0)
{
cctrCodeTax = cctrCodePh;
}
} }
} }
// End by GSoni. // End by GSoni.
...@@ -1723,7 +1741,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1723,7 +1741,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
} }
//end o the code added by ajit on date 25-Nov-2016 //end o the code added by ajit on date 25-Nov-2016
System.out.println("Account 8 acctCodeTax [" + acctCodeTax + "] taxAmt [" + taxAmt+ "]");
// lsStr = "acct_code = '"+ acctCodeTax +"' and cctr_code = '" + cctrCodeTax + "'" // lsStr = "acct_code = '"+ acctCodeTax +"' and cctr_code = '" + cctrCodeTax + "'"
// gf_nulltostr() called to convert null to blank string by Amit on 19/09/03 for DB2. // gf_nulltostr() called to convert null to blank string by Amit on 19/09/03 for DB2.
//lsStr = "acct_code = '"+ gf_nulltostr(acctCodeTax) +"' and cctr_code = '" + gf_nulltostr(cctrCodeTax) + "' and proj_code = '" + gf_nulltostr(projCode) + "'" //proj_code added by ajit on date 25-Nov-2016" //lsStr = "acct_code = '"+ gf_nulltostr(acctCodeTax) +"' and cctr_code = '" + gf_nulltostr(cctrCodeTax) + "' and proj_code = '" + gf_nulltostr(projCode) + "'" //proj_code added by ajit on date 25-Nov-2016"
...@@ -1813,6 +1831,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1813,6 +1831,7 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
errString = getMsg(" FINPARM variable RND_ACCT not defined for rounding account round amount [" + rndAmt + "]","VTFINPARM", conn); errString = getMsg(" FINPARM variable RND_ACCT not defined for rounding account round amount [" + rndAmt + "]","VTFINPARM", conn);
return errString; return errString;
} }
System.out.println("Account 9 acctCodeRnd [" + acctCodeRnd + "] rndAmt [" + rndAmt+ "]");
detMap = new HashMap(); detMap = new HashMap();
lineCount++; lineCount++;
detMap.put("tran_id", tranId); detMap.put("tran_id", tranId);
......
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