Skip to content

B
business-java
Commit 398a1ec3 authored by mmhatre's avatar mmhatre
Browse files
Options

misc credit note tax has been calculated 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216279 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 693b8485
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 18 deletions
webitm-dis/src/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java
View file @ 398a1ec3
......@@ -6611,7 +6611,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if ("D".equalsIgnoreCase(drcrFlag))
{
transer = "MDRCRD";
tranSer = "MDRCRD";
tranwin = "W_MISC_DRCR_RCP_DR";
window = "T_MISC_DRCR_RCP_DRHO";
//ls_auto_tran_id = generateTranId("w_misc_drcr_rcp_cr",as_site_code,ls_drcr_flag,currDateStr,conn);
......@@ -6620,7 +6620,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
else if ("C".equalsIgnoreCase(drcrFlag))
{
transer = "MDRCRC";
tranSer = "MDRCRC";
tranwin = "W_MISC_DRCR_RCP_CR";
window = "T_MISC_DRCR_RCP_CRHO";
//ls_auto_tran_id = generateTranId("w_misc_drcr_rcp_cr",as_site_code,ls_drcr_flag,currDateStr,conn);
......@@ -6795,7 +6795,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
" cctr_code,amount,curr_code,exch_rate,remarks,drcr_flag,tran_id__rcv,confirmed,chg_user,chg_date,chg_term," +
" emp_code__aprv,due_date,tran_type,item_ser,amount__bc,sreturn_no,adj_misc_crn,adj_amount,parent__tran_id,rev__tran," +
" round_adj,cust_ref_no,cust_ref_date,cust_ref_amt,rnd_off,rnd_to,ref_no__cr,wf_status,cust_code__dlv,cust_pord,pord_date," +
" edi_stat,sale_order,add_date,add_user,add_term) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,) ";
" edi_stat,sale_order,add_date,add_user,add_term) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
pstmt = conn.prepareStatement(sql);
//pstmt.setString(1,tranId);
......@@ -6990,9 +6990,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
"line_no__sret,line_no__invtrace,lot_no,analysis1,analysis2,analysis3,lot_sl,unit" +
" from misc_drcr_rdet " +
" where tran_id = ? and ITEM_CODE is not null";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, tranIdAs);
rs=pstmt.executeQuery();
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1, tranIdAs);
rs=pstmt1.executeQuery();
while(rs.next())
{
lineNo=rs.getInt("line_no");
......@@ -7023,11 +7023,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if( netAmt==0 ) {
netAmt=0;
}
if(amountdet==0)
/*if(amountdet==0)
{
amountdet=0;
netAmt=netAmt-taxAmt;
}
}*/
if(lbFlag)
{
taxEnvSr=(finCommon.getFinparams("999999","SRETURN_TAX_ENV",conn));
......@@ -7175,19 +7175,42 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt=null;*/
}
pstmt1.close();
pstmt1=null;
rs.close();
rs=null;
sql="select SUM(net_amt) from misc_drcr_rdet where tran_id= ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, tranIdNew);
rs=pstmt.executeQuery();
if(rs.next())
{
amount=rs.getDouble(1);
}
pstmt.close();
pstmt=null;
rs.close();
rs=null;
amountBc=amount *exchRate;
sql=" update misc_drcr_rcp set amount = ? ,amount__bc= ? where tran_id = ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setDouble(1,amount);
pstmt.setDouble(2,amountBc);
pstmt.setString(3,tranIdNew);
pstmt.executeUpdate();
pstmt.close();
pstmt=null;
sql="select line_no,ref_ser,ref_no,ref_bal_amt,adj_amt,mrp_value__adj "+
" from misc_drcr_rcpinv where tran_id= ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, tranIdAs);
rs=pstmt.executeQuery();
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1, tranIdAs);
rs=pstmt1.executeQuery();
while(rs.next())
{
lineNoRcpinv=rs.getInt("line_no");
......@@ -7242,14 +7265,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt=null;*/
}
pstmt.close();
pstmt=null;
pstmt1.close();
pstmt1=null;
rs.close();
rs=null;
/* xmlBuff.append("</Header0>");
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");*/
String xmlString = xmlBuff.toString().trim().replaceFirst("^([\\W]+)<","<");
/*String xmlString = xmlBuff.toString().trim().replaceFirst("^([\\W]+)<","<");
String drNtTranId="";
// errString = saveData(xtraParams,siteCodeAs,xmlString,conn);
errString = saveData(xtraParams,siteCodeAs,xmlBuff.toString(),conn);
......@@ -7267,12 +7290,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
//System.out.println("[SuccessSuccess" + errorString + "]");
conn.rollback();
return errString;
}
}*/
//errString = nvo_misc.gbf_retrieve_misc_drcr_rcp(ls_tran_id_new, ls_tran_id_new,1,siteCodeAs);
DrCrRcpConf drcrObj = new DrCrRcpConf();
errString = drcrObj.confirm (tranIdNew, xtraParams, "" , conn);
MiscDrCrRcpConf confDebitNote = new MiscDrCrRcpConf();
errString= confDebitNote.confirm(tranIdNew,xtraParams, "" , conn);
//System.out.println("After DrCrRcpConf---->["+errorString+"]");
if(errString != null && errString.indexOf("VTCICONF3") != -1)
if(errString != null && errString.indexOf("CONFSUCCES") != -1)
{
errString = "";
}
......
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