Skip to content

B
business-java
Commit ab0caac9 authored by cpatil's avatar cpatil
Browse files
Options

modify @base for tax row 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101572 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dabe64b3
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 28 deletions
webitm-fin/ibase/webitm/ejb/fin/PurchaseVoucherGltracePreview.java
View file @ ab0caac9
......@@ -117,7 +117,9 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
sql = "select tran_id,tran_type,tran_date,(case when retention_amt is null then 0 else retention_amt end) as retention_amt,(case when retention_days is null then 0 else retention_days end) as retention_days,"
+"eff_date,fin_entity,site_code,supp_code,acct_code,cctr_code,emp_code,curr_code,exch_rate,"
+"remarks,proj_code,anal_code,rnd_amt,vouch_type,tran_mode,acct_code__cf,cctr_code__cf,net_amt,purc_order,bill_amt,tax_amt,adv_amt,rnd_off,rnd_to from voucher where tran_id = ?";
+"remarks,proj_code,anal_code,rnd_amt,vouch_type,tran_mode,acct_code__cf,cctr_code__cf,net_amt,purc_order,bill_amt,tax_amt,adv_amt,rnd_off,rnd_to"
+",diff_amt__exch "
+"from voucher where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranID);
......@@ -154,6 +156,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
netAmt = rs.getDouble("net_amt");
rndOff = checkNull(rs.getString("rnd_off"));
rndTo = rs.getDouble("rnd_to");
diffamtexch = rs.getDouble("diff_amt__exch");
System.out.println("VOUCHER TYPE>>>>>>>>>>>>>>>>>"+vouchtype);
if("A".equalsIgnoreCase(vouchtype))
......@@ -197,11 +200,13 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
pstmt1.close();
pstmt1=null;
System.out.println("@@@@@@@@@@@203 amtupd["+amtupd+"]=billamt["+billamt+"]+taxamt["+taxamt+"]-holdTax["+holdTax+"]");
amtupd = billamt + taxamt - holdTax;
retentionamt = rs.getDouble("retention_amt");
retentiondays = rs.getDouble("retention_days");
amtupd = amtupd - retentionamt;
System.out.println("@@@@@@@@@@@205 amtupd["+amtupd+"]");
}// end of vch_type = A condition
}
rs.close();
......@@ -301,7 +306,14 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
hdrmap.put("anal_code",analcode);
hdrmap.put("curr_code",currcode );
hdrmap.put("exch_rate",exch_h);
double lc_netwr1=0,netAmt1=0;
System.out.println("@@@@@@@@ amtupd["+amtupd+"]rndamt["+rndamt+"]");
lc_netwr1 = netAmt;
netAmt1 = getRndamt(netAmt, rndOff, rndTo);
rndamt = netAmt1 - lc_netwr1;
System.out.println("rndamt >>> ["+rndamt+"]");
if(amtupd > 0)
{
hdrmap.put("dr_amt",0.0);
......@@ -521,7 +533,9 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
pstmt.close();
pstmt=null;
sql = "SELECT proj_code,line_no,tax_amt,acct_code,amount,cctr_code,dept_code,emp_code,anal_code,analysis1,analysis2,analysis3,basic_curr FROM vouchdet WHERE tran_id = ?" ;
sql = "SELECT proj_code,line_no,tax_amt,acct_code,amount,cctr_code,dept_code," +
"emp_code,anal_code,analysis1,analysis2,analysis3,basic_curr" +
" FROM vouchdet WHERE tran_id = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranID);
......@@ -757,6 +771,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
while(rs.next())
{
lineNoRcp = rs.getString("line_no");
System.out.println("@@@@@@@@@lineNoRcp["+lineNoRcp+"]");
prcpId = rs.getString("prcp_id");
// rcpAmt = rs.getDouble("vouch_amt");
itemCode = checkNull(rs.getString("item_code"));
......@@ -781,7 +796,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
pstmt1.setString(1,prcpId);
pstmt1.setString(2,lineNoRcp);
rs1 = pstmt1.executeQuery();
while(rs1.next())
if(rs1.next())
{
rcpQty = rs1.getDouble("ld_rcp_qty");
vouchQty = rs1.getDouble("ld_vouch_qty");
......@@ -801,7 +816,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
pstmt1.setString(1,prcpId);
rs1 = pstmt1.executeQuery();
while(rs1.next())
if(rs1.next())
{
postType = rs1.getString("post_type");
acctInvOnline = rs1.getString("acct_inv_online");
......@@ -819,7 +834,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
}
/************/
System.out.println("Transaction Type >>>>"+tranType);
System.out.println("Transaction Type >>>>["+tranType+"]");
System.out.println("acctCodePh >>>>"+acctCodePh+ " cctrCodePh "+cctrCodePh);
String[] arrayOne = new String[1000];
if(acctCodePh == null || acctCodePh.trim().length() == 0 )
......@@ -868,6 +883,8 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
}
stdAmt = qty * stdRate;
//lc_stdamt = lc_stdamt - lc_addcost
stdAmt = stdAmt - addCost;
actAmt = rs.getDouble("vouch_amt");
if("S".equalsIgnoreCase(postType))
......@@ -880,6 +897,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
{
rcpAmt = actAmt;
}
System.out.println("@@@@@@@ rcpAmt["+rcpAmt+"]");
if(!"S".equalsIgnoreCase(postType) && !"N".equalsIgnoreCase(acctInvOnline))
{
sql = "select sum(nvl(reco_amount,0)) as lc_porcp_reco from taxtran " +
......@@ -890,7 +908,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
pstmt1.setString(1,prcpId);
pstmt1.setString(2,lineNoRcp);
rs1 = pstmt1.executeQuery();
while(rs1.next())
if(rs1.next())
{
porcpReco = rs1.getDouble("lc_porcp_reco");
......@@ -909,7 +927,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
pstmt1.setString(1,prcpId);
pstmt1.setString(2,lineNoRcp);
rs1 = pstmt1.executeQuery();
while(rs1.next())
if(rs1.next())
{
nonPayable = rs1.getDouble("lc_non_payable");
......@@ -920,16 +938,27 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
pstmt1=null;
System.out.println("@@@@@@@@@ rcpMra["+rcpMra+"]-nonPayable["+nonPayable+"]+discAmt["+discAmt+"]");
// lc_rcp_mra = lc_rcp_mra - lc_non_payable + lc_disc_amt
rcpMra = rcpMra - nonPayable + discAmt;
/// praportionate mra as per the voucher quantity.
/*lc_rcp_mra = lc_rcp_mra * (ld_qty/ld_rcp_qty)
lc_mra_ppv = lc_rcp_amt - lc_rcp_mra /// voucher amount - rcp mra amount
lc_rcp_amt = lc_rcp_mra */
System.out.println("@@@@@@@@@ rcpMra["+rcpMra+"]*qty["+qty+"]/rcpQty["+rcpQty+"]");
rcpMra = rcpMra * (qty/rcpQty);
System.out.println("@@@@@@@@@ mraPpv["+mraPpv+"]rcpAmt["+rcpAmt+"]-rcpMra["+rcpMra+"]");
mraPpv = rcpAmt - rcpMra;
System.out.println("@@@@@@@@@ rcpAmt["+rcpAmt+"]-rcpMra["+rcpMra+"]");
rcpAmt = rcpMra;
System.out.println("@@@@@@@@@942 rcpAmt["+rcpAmt+"]");
if(Double.isNaN(rcpAmt) )
{
rcpAmt = 0;
}
System.out.println("@@@@@@@@@942 isNaN rcpAmt["+rcpAmt+"]");
}// calculate MRA and post diff to PPV a/c
......@@ -942,7 +971,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
pstmt2.setString(1,prcpId);
pstmt2.setString(2,lineNoRcp);
rs2 = pstmt2.executeQuery();
while(rs2.next())
if(rs2.next())
{
rcpQty = rs2.getDouble("quantity");
vchQty = rs2.getDouble("vouch_qty");
......@@ -957,15 +986,17 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
acctCodeDis= finCommon.getAcctDetrTtype(itemCode, itemSer, "DIS", tranType, conn);
cctrCodeDis1 = getTokens(acctCodeDis,",");
System.out.println("@@@@@@@@@942 rcpAmt["+rcpAmt+"]-(rcpQty["+rcpQty+"]-vchQty["+vchQty+"])*rate["+rate+"]");
/*// calculation not found in pb code //cpatil@base
varAmt = rcpAmt - (rcpQty - vchQty)*rate;
System.out.println("tHE vAMT *****"+varAmt);
System.out.println("tHE vAMT *****["+varAmt+"]");
if(varAmt != 0.0)
{
rcpAmt = (rcpQty - vchQty)*rate;
}
System.out.println("RCP AMount >>>>>>>>>>"+rcpAmt);
*/
System.out.println("RCP AMount >>>>>>>>>>["+rcpAmt+"]");
/*sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
pstmt2 = conn.prepareStatement(sql);
......@@ -1079,7 +1110,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
rs1=null;
pstmt1.close();
pstmt1=null;*/
double foundAmount=0;
String[] amtRecov = new String[1000];
if(acctCodeReco == null || acctCodeReco.trim().length() == 0)
{
......@@ -1115,12 +1146,16 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
}
if(!"S".equalsIgnoreCase(postType) && "N".equalsIgnoreCase(acctInvOnline))
{
rcpMap.put("amount",amount - sumRecAmt);
foundAmount = Double.parseDouble(rcpMap.get("amount")==null?"0":rcpMap.get("amount").toString());
//rcpMap.put("amount",amount - sumRecAmt);
rcpMap.put("amount", foundAmount - sumRecAmt);
}
else
{
totrecoamt = totrecoamt + sumRecAmt;
rcpMap.put("amount", foundAmount + sumRecAmt);
}
/* sql = "select count(*) from vouchdet where acct_code = ? and cctr_code = ?";
......@@ -1147,7 +1182,8 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
rcpMap.put("site_code",sitecode);
rcpMap.put("acct_code",checknull(acctCodeRecovStr).trim());
rcpMap.put("cctr_code",cctrCodeRecovStr);
rcpMap.put("dr_amt",sumRecAmt );
//rcpMap.put("dr_amt",sumRecAmt );
rcpMap.put("dr_amt",foundAmount + sumRecAmt );
rcpMap.put("cr_amt",0.0);
rcpMap.put("dept_code",deptCode);
//hdrmap.put("emp_code",rs.getString(""));
......@@ -1214,7 +1250,7 @@ public class PurchaseVoucherGltracePreview extends ActionHandlerEJB implements P
}
/// if posting is standards then post diff to diff account
System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
if(!"N".equalsIgnoreCase(acctInvOnline))
{
taxDiff = 0.0;
......@@ -1227,7 +1263,7 @@ System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
pstmt1.setString(1,tranID);
pstmt1.setString(2,lineNoRcp);
rs1 = pstmt1.executeQuery();
while(rs1.next())
if(rs1.next())
{
taxDiff = rs1.getDouble("lc_taxdiff");
totRecAmt = rs1.getDouble("lc_totrecoamt");
......@@ -1241,16 +1277,21 @@ System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
if("S".equalsIgnoreCase(postType))
{
System.out.println("@@@@@@1261 taxDiff["+taxDiff+"]-totRecAmt["+totRecAmt+"]");
taxDiff = taxDiff - totRecAmt;
System.out.println("taxDiff["+taxDiff+"]-exch_h["+exch_h+"]");
// amish 31-08-04 post diff in basic currency if post type is standard
taxDiff = taxDiff * exch_h;
System.out.println("diffAmt["+diffAmt+"]+taxDiff["+taxDiff+"]");
diffAmt = diffAmt + taxDiff;
System.out.println("diffAmt["+diffAmt+"]");
}
else
{
System.out.println("@@@@@@1272 mraPpv["+mraPpv+"]taxDiff["+taxDiff+"]");
mraPpv = mraPpv + taxDiff;
diffAmt = mraPpv;
System.out.println("mraPpv["+mraPpv+"]diffAmt["+diffAmt+"]");
}
System.out.println("Difference Amount :::::::::::::: "+diffAmt);
acctppv= checkNull(finCommon.getAcctDetrTtype(itemCode, itemSer, "PPV", tranType, conn));
......@@ -1302,8 +1343,16 @@ System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
rcpMap.put("site_code",sitecode);
rcpMap.put("acct_code",checknull(acctPpvStr).trim());
rcpMap.put("cctr_code",cctrPpvStr);
rcpMap.put("dr_amt",diffAmt);
rcpMap.put("cr_amt",0.0);
if( diffAmt > 0)
{
rcpMap.put("dr_amt",diffAmt);
rcpMap.put("cr_amt",0.0);
}
else
{
rcpMap.put("dr_amt",0.0);
rcpMap.put("cr_amt",-1*diffAmt);
}
rcpMap.put("dept_code",deptCode);
//hdrmap.put("emp_code",rs.getString(""));
rcpMap.put("anal_code",analCode);
......@@ -1369,7 +1418,7 @@ System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
System.out.println("@@@@@@@@ varAmt["+varAmt+"]");
System.out.println("@@@@@@@@ varAmt["+varAmt+"]"); //not found in pb code cpatil
if(varAmt != 0.0 && false)//Variance amount //test
{
acctVar= checkNull(finCommon.getAcctDetrTtype(itemCode, itemSer, "PPV", tranType, conn));
......@@ -1562,7 +1611,7 @@ System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
pstmt2 = conn.prepareStatement(sql);
pstmt2.setString(1,tranID);
rs2 = pstmt2.executeQuery();
while(rs2.next())
if(rs2.next())
{
purcOrd = rs2.getString("ls_purc_ord");
}
......@@ -1596,7 +1645,7 @@ System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
pstmt2.setString(1,tranID);
// pstmt2.setString(2,cctrCodeDis);
rs2 = pstmt2.executeQuery();
while(rs2.next())
if(rs2.next())
{
taxLs = rs2.getString("li_tax");
}
......@@ -1632,7 +1681,7 @@ System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
pstmt2.close();
pstmt2=null;*/
if(lc_tax_amt > 0.0)
if( lc_tax_amt != 0.0)
{
if(ls_acct_tax == null || ls_acct_tax.trim().length() == 0)
{
......@@ -1736,7 +1785,8 @@ System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
pstmt2=null;
//Rounding off net Amt
String ls_cctrcode_rnd = "",ls_acctcode_rnd = "";
String ls_cctrcode_rnd = " ",ls_acctcode_rnd = "";
System.out.println("@@@@@@@@@@@1762 rndOff["+rndOff+"]");
if(rndOff != "N")
{
lc_netwr = netAmt;
......@@ -1747,7 +1797,7 @@ System.out.println("@@@@@@@@@ acctInvOnline["+acctInvOnline+"]");
{
ls_cctrcode_rnd = finCommon.getFinparams("999999", "RND_ACCT", conn);
System.out.println("@@@@@@@@ ls_cctrcode_rnd["+ls_cctrcode_rnd+"]");
System.out.println("@@@@@@@@ ls_cctrcode_rnd["+ls_cctrcode_rnd+"]");
if(ls_cctrcode_rnd != "NULLFOUND")
{
//ls_acctcode_rnd = getTokens(ls_cctrcode_rnd,";");
......@@ -1802,7 +1852,8 @@ System.out.println("@@@@@@@@ ls_cctrcode_rnd["+ls_cctrcode_rnd+"]");
else
{
rcpMap.put("dr_amt",0.0);
rcpMap.put("cr_amt", lc_rndAmt ); //lc_tax_amt
//rcpMap.put("cr_amt", lc_rndAmt ); modify by cpatil@base
rcpMap.put("cr_amt", -1*lc_rndAmt ); //lc_tax_amt
}
rcpMap.put("dept_code",deptCode);
//hdrmap.put("emp_code",rs.getString(""));
......
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