Skip to content

B
business-java
Commit f2f7543b authored by ngadkari's avatar ngadkari
Browse files
Options

Rate to be made non-editable in case pricelist type <> 'L' also if rate is... 

Rate to be made non-editable in case pricelist type <> 'L' also if rate is coming from minimum rate history


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@197614 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 19473166
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 16 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java
View file @ f2f7543b
......@@ -1694,7 +1694,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
varValue = distCommon.getPriceListType(priceList,conn);
varValue = varValue == null ?"" : varValue.trim();
fullRet = fullRet == null ?"" : fullRet.trim();
if ("B".equals(varValue) || "F".equals(varValue) || "Y".equals(fullRet))
//if ("B".equals(varValue) || "F".equals(varValue) || "Y".equals(fullRet)) condition change by nandkumar gadkari on 25/02/19
if (!"L".equals(varValue) || "Y".equals(fullRet))
{
valueXmlString.append("<rate protect =\"1\">").append("<![CDATA[0]]>").append("</rate>");
}
......@@ -1711,7 +1712,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
valueXmlString.append("<ret_rep_flag protect =\"1\">").append("<![CDATA[P]]>").append("</ret_rep_flag>");
varValue = distCommon.getDisparams("999999","CALC_TAX_ON_REPLACE",conn);
if ("N".equals(varValue) )
//tax_class, tax_chap and tax_env protect un protect code commented by nandkumar gadkari on 25/02/19
/*if ("N".equals(varValue) )
{
valueXmlString.append("<tax_chap protect =\"1\">").append("<![CDATA["+ "" +"]]>").append("</tax_chap>");
valueXmlString.append("<tax_class protect =\"1\">").append("<![CDATA[" + ""+"]]>").append("</tax_class>");
......@@ -1722,9 +1724,10 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
valueXmlString.append("<tax_chap protect =\"0\">").append("<![CDATA[" + ""+"]]>").append("</tax_chap>");
valueXmlString.append("<tax_class protect =\"0\">").append("<![CDATA[" + ""+"]]>").append("</tax_class>");
valueXmlString.append("<tax_env protect =\"0\">").append("<![CDATA[" + ""+"]]>").append("</tax_env>");
}*/
}
}
else if ("R".equals(retOpt))
//tax_class, tax_chap and tax_env protect un protect code commented by nandkumar gadkari on 25/02/19
/*else if ("R".equals(retOpt))
{
//valueXmlString.append("<ret_rep_flag protect =\"0\">").append("<![CDATA["+""+"]]>").append("</ret_rep_flag>");
valueXmlString.append("<tax_chap protect =\"1\">").append("<![CDATA[" + ""+"]]>").append("</tax_chap>");
......@@ -1737,7 +1740,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
valueXmlString.append("<tax_chap protect =\"0\">").append("<![CDATA[" + ""+"]]>").append("</tax_chap>");
valueXmlString.append("<tax_class protect =\"0\">").append("<![CDATA[" + ""+"]]>").append("</tax_class>");
valueXmlString.append("<tax_env protect =\"0\">").append("<![CDATA[" + ""+"]]>").append("</tax_env>");
}
}*/
valueXmlString.append("<stk_opt protect =\"1\">").append("<![CDATA[" + ""+"]]>").append("</stk_opt>");
} // end itm_default
......@@ -1790,6 +1793,27 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
}
else
{
//added by nandkumar gadkari on 25/02/19-----------start ---------to protect rate when it is from min_rate_history-----------
String docKey="";
boolean minRateHisRate=false;
docKey = genericUtility.getColumnValue("doc_key",dom);
sql = " select count(*) from min_rate_history where doc_key = ?";
pstmt= conn.prepareStatement( sql );
pstmt.setString( 1, docKey );
rs = pstmt.executeQuery();
if( rs.next() )
{
cnt = rs.getInt(1);
if(cnt > 0 )
{
minRateHisRate=true;
}
}
rs.close();
pstmt.close();
pstmt = null;
rs = null;
//added by nandkumar gadkari on 25/02/19-----------end --------------------
priceList = genericUtility.getColumnValue("price_list",dom1);
varValue = distCommon.getDisparams("999999","SRET_RATE_EDITABLE",conn);
varValue = varValue == null ?"" : varValue.trim();
......@@ -1798,7 +1822,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
retOpt = retOpt == null ?"" : retOpt.trim();
if ("Y".equalsIgnoreCase(varValue.trim()) )
{
if ("Y".equalsIgnoreCase(fullRet.trim()))
if ("Y".equalsIgnoreCase(fullRet.trim()) || minRateHisRate)// minRateHisRate added by nandkumar gadkari on 25/02/19
{
valueXmlString.append("<rate protect =\"1\">").append("<![CDATA[" + sRate + "]]>").append("</rate>");
}
......@@ -1823,7 +1847,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
varValue = distCommon.getPriceListType(priceList,conn);
varValue = varValue == null ?"" : varValue.trim();
if ("B".equals(varValue) || "F".equals(varValue) || "Y".equals(fullRet))
//if ("B".equals(varValue) || "F".equals(varValue) || "Y".equals(fullRet)) condition change by nandkumar gadkari on 25/02/19
if (!"L".equals(varValue) || "Y".equals(fullRet) ||minRateHisRate)// minRateHisRate added by nandkumar gadkari on 25/02/19
{
valueXmlString.append("<rate protect =\"1\">").append("<![CDATA[" + sRate + "]]>").append("</rate>");
}
......@@ -1851,7 +1876,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
valueXmlString.append("<ret_rep_flag protect =\"1\">").append("<![CDATA[" + retReplFlag + "]]>").append("</ret_rep_flag>");
varValue = distCommon.getDisparams("999999","CALC_TAX_ON_REPLACE",conn);
if ("N".equals(varValue) )
//tax_class, tax_chap and tax_env protect un protect code commented by nandkumar gadkari on 25/02/19
/*if ("N".equals(varValue) )
{
valueXmlString.append("<tax_chap protect =\"1\">").append("<![CDATA[" + ""+"]]>").append("</tax_chap>");
valueXmlString.append("<tax_class protect =\"1\">").append("<![CDATA[" + ""+"]]>").append("</tax_class>");
......@@ -1862,21 +1888,23 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
valueXmlString.append("<tax_chap protect =\"0\">").append("<![CDATA[ " + taxChap + "]]>").append("</tax_chap>");
valueXmlString.append("<tax_class protect =\"0\">").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_env protect =\"0\">").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
}
}*/
}
else if ("R".equals(retOpt))
{
valueXmlString.append("<ret_rep_flag protect =\"0\">").append("<![CDATA[" + retReplFlag +"]]>").append("</ret_rep_flag>");
valueXmlString.append("<tax_chap protect =\"1\">").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
//tax_class, tax_chap and tax_env protect un protect code commented by nandkumar gadkari on 25/02/19
/*valueXmlString.append("<tax_chap protect =\"1\">").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
valueXmlString.append("<tax_class protect =\"1\">").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_env protect =\"1\">").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
valueXmlString.append("<tax_env protect =\"1\">").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");*/
}
else
{
valueXmlString.append("<ret_rep_flag protect =\"1\">").append("<![CDATA[" + retReplFlag + "]]>").append("</ret_rep_flag>");
valueXmlString.append("<tax_chap protect =\"0\">").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
//tax_class, tax_chap and tax_env protect un protect code commented by nandkumar gadkari on 25/02/19
/*valueXmlString.append("<tax_chap protect =\"0\">").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
valueXmlString.append("<tax_class protect =\"0\">").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_env protect =\"0\">").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
valueXmlString.append("<tax_env protect =\"0\">").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");*/
}
valueXmlString.append("<stk_opt protect =\"1\">").append("<![CDATA[" + stkOpt + "]]>").append("</stk_opt>");
//Added by sarita on 29 JUN 18 [START] on edit mode if exp_date available against lot_no , lot_sl , item_code and site_code in stock then system should not allow to change exp_date
......@@ -2176,7 +2204,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
rate = 0;
}
if ("B".equals(varValue) || "F".equals(varValue) || "Y".equals(fullRet))
//if ("B".equals(varValue) || "F".equals(varValue) || "Y".equals(fullRet)) condition change by nandkumar gadkari on 25/02/19
if (!"L".equals(varValue) || "Y".equals(fullRet))
{
valueXmlString.append("<rate protect =\"1\">").append("<![CDATA[" + rate + "]]>").append("</rate>");
setNodeValue( dom, "rate", rate );
......@@ -3715,7 +3744,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = null;
valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>");
valueXmlString.append("<rate>").append("<![CDATA[" + rate + "]]>").append("</rate>");
valueXmlString.append("<rate protect =\"1\">").append("<![CDATA[" + rate + "]]>").append("</rate>");// rate protected by nandkumar gadkari on 25/02/18
/*if(invRefDate != null && invRefDate.trim().length() >0)
{
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>");
......@@ -3834,7 +3863,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
rs = null;
}
isMinHisRateSet = true;
valueXmlString.append("<rate>").append("<![CDATA[" + rate + "]]>").append("</rate>");
valueXmlString.append("<rate protect =\"1\">").append("<![CDATA[" + rate + "]]>").append("</rate>");// rate protected by nandkumar gadkari on 25/02/18
valueXmlString.append("<doc_key>").append("<![CDATA[" + minRateDocKey + "]]>").append("</doc_key>");
//Set inv_ref and date [Start]...PriyankaC on 26JUNE2018.
setNodeValue( dom, "doc_key", minRateDocKey );
......
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