Commit fd5242d3 authored by caluka's avatar caluka

sale order added in receivables when confirm Misc.credit note and Misc. debit...

sale order added in receivables when confirm Misc.credit note and Misc. debit note Entry Screen  [F14BDOS001]


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96272 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6f4da64d
......@@ -241,7 +241,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
java.sql.Timestamp confDate = null;
String tranSer="",sundryType="",tranType="",siteCode="",finEntity="",sundryCode="",acctCode="";
String cctrCode="",currCode="",remarks="",confirmed="",empCodeAprv="",drcrFlag="",tranIdRcv="";
String cctrCode="",currCode="",remarks="",confirmed="",empCodeAprv="",drcrFlag="",tranIdRcv="",saleOrder="";
String itemSer="",sreturnNo="",adjMiscCrn="",custRefNo="",rndOff="",custCode="",siteCodeDrcr="";
double amount=0,amountBc=0,exchRate=0,adjAmount=0,roundAdj=0,rndTo=0;
......@@ -283,7 +283,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
+" site_code, fin_entity,sundry_code,acct_code,cctr_code,amount,curr_code,remarks, "
+" confirmed,conf_date,emp_code__aprv,drcr_flag,tran_id__rcv,item_ser, "
+" amount__bc,exch_rate,sreturn_no,adj_misc_crn,adj_amount,round_adj,cust_ref_no,"
+" cust_ref_date,cust_ref_amt,rnd_off,rnd_to "
+" cust_ref_date,cust_ref_amt,rnd_off,rnd_to,sale_order "//Added by chandrashekar on dtd 25/08/2014
+" from misc_drcr_rcp "
+" where tran_id = ? for update" ;
......@@ -294,7 +294,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
+" site_code, fin_entity,sundry_code,acct_code,cctr_code,amount,curr_code,remarks, "
+" confirmed,conf_date,emp_code__aprv,drcr_flag,tran_id__rcv,item_ser, "
+" amount__bc,exch_rate,sreturn_no,adj_misc_crn,adj_amount,round_adj,cust_ref_no,"
+" cust_ref_date,cust_ref_amt,rnd_off,rnd_to "
+" cust_ref_date,cust_ref_amt,rnd_off,rnd_to,sale_order "//Added by chandrashekar on dtd 25/08/2014
+" from misc_drcr_rcp (updlock) "
+" where tran_id = ? " ;
......@@ -305,7 +305,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
+" confirmed,conf_date,emp_code__aprv,drcr_flag,tran_id__rcv,item_ser, "
+" amount__bc,exch_rate,sreturn_no,adj_misc_crn,adj_amount,round_adj,cust_ref_no,"
// +" cust_ref_date,cust_ref_amt,rnd_off,rnd_to,site_code__drcr "
+" cust_ref_date,cust_ref_amt,rnd_off,rnd_to "
+" cust_ref_date,cust_ref_amt,rnd_off,rnd_to,sale_order "//Added by chandrashekar on dtd 25/08/2014
+" from misc_drcr_rcp "
+" where tran_id = ? for update nowait " ;
......@@ -344,6 +344,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
custRefNo = rs.getString("cust_ref_no");
rndOff = rs.getString("rnd_off");
rndTo = rs.getDouble("rnd_to");
saleOrder = rs.getString("sale_order");//Added by chandrashekar dtd 25/08/2014 to set sales order in receivable
//siteCodeDrcr = rs.getString("site_code__drcr");
}
rs.close();
......@@ -352,7 +353,6 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
pstmt = null;
miscRcpMap = new HashMap();
//Manoj dtd 18/12/2013 reason code set in miscRcpMap to update in receivables
pstmt=conn.prepareStatement("SELECT MAX(REAS_CODE) FROM MISC_DRCR_RDET WHERE TRAN_ID=? AND REAS_CODE IS NOT NULL");
......@@ -397,6 +397,8 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
miscRcpMap.put("rnd_to",rndTo);
//Added By Manoj dtd 03/05/2013 to set Customer code to update in receivable
miscRcpMap.put("cust_code",sundryCode);
//Added By chandrashekar dtd 25/08/2014 to set sales order in receivable
miscRcpMap.put("sale_order",saleOrder);
//miscRcpMap.put("site_code__drcr",siteCodeDrcr);
......
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