Commit 6e2c4029 authored by prane's avatar prane

If return option is credit note[C] then system should not be validate the price list

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183111 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 181ce229
...@@ -5670,6 +5670,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -5670,6 +5670,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
String locCode = "", faciLocCode = "", faciSiteCode = ""; String locCode = "", faciLocCode = "", faciSiteCode = "";
String tranId = ""; String tranId = "";
//String invoiceId = ""; //Added By PriyankaC on 15JAN18. //String invoiceId = ""; //Added By PriyankaC on 15JAN18.
String retOpt = "";
String channelPartner=""; String channelPartner="";
try try
{ {
...@@ -6137,7 +6138,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -6137,7 +6138,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( childNodeName.equalsIgnoreCase( "price_list" ) ) if( childNodeName.equalsIgnoreCase( "price_list" ) )
{ {
mVal = genericUtility.getColumnValue( "price_list", dom ); mVal = genericUtility.getColumnValue( "price_list", dom );
retOpt = genericUtility.getColumnValue("ret_opt",dom1);
if(!"C".equalsIgnoreCase(retOpt))
{
sqlStr = " Select Count(*) cnt from pricelist where price_list = ? "; sqlStr = " Select Count(*) cnt from pricelist where price_list = ? ";
pstmt = conn.prepareStatement( sqlStr ); pstmt = conn.prepareStatement( sqlStr );
...@@ -6162,6 +6165,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -6162,6 +6165,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
} }
}
if( childNodeName.equalsIgnoreCase( "ret_opt" ) ) if( childNodeName.equalsIgnoreCase( "ret_opt" ) )
{ {
mVal = genericUtility.getColumnValue( "ret_opt", dom ); mVal = genericUtility.getColumnValue( "ret_opt", dom );
......
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