Commit bec6962d authored by steurwadkar's avatar steurwadkar

Sales return changes to set docKey and set rate from pricelist if invoice id...

Sales return changes to set docKey and set rate from pricelist if invoice id not found in min_rate_history


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@43834 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 94ce325c
...@@ -9801,19 +9801,19 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -9801,19 +9801,19 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{ {
if("cust_code".equalsIgnoreCase(varValueArry[i].trim())) if("cust_code".equalsIgnoreCase(varValueArry[i].trim()))
{ {
docValue = genericUtility.getColumnValue(varValueArry[i].trim(),headerDom).trim(); docValue = checkNull(genericUtility.getColumnValue(varValueArry[i].trim(),headerDom)).trim();
} }
else if("site_code".equalsIgnoreCase(varValueArry[i].trim())) else if("site_code".equalsIgnoreCase(varValueArry[i].trim()))
{ {
docValue = genericUtility.getColumnValue(varValueArry[i].trim(),headerDom).trim(); docValue = checkNull(genericUtility.getColumnValue(varValueArry[i].trim(),headerDom)).trim();
} }
else if("item_code".equalsIgnoreCase(varValueArry[i].trim())) else if("item_code".equalsIgnoreCase(varValueArry[i].trim()))
{ {
docValue = genericUtility.getColumnValue(varValueArry[i].trim(),curDetDom).trim(); docValue = checkNull(genericUtility.getColumnValue(varValueArry[i].trim(),curDetDom)).trim();
} }
else if("lot_no".equalsIgnoreCase(varValueArry[i].trim())) else if("lot_no".equalsIgnoreCase(varValueArry[i].trim()))
{ {
docValue = genericUtility.getColumnValue(varValueArry[i].trim(),curDetDom).trim(); docValue = checkNull(genericUtility.getColumnValue(varValueArry[i].trim(),curDetDom)).trim();
} }
else if("invoice_id".equalsIgnoreCase(varValueArry[i].trim())) else if("invoice_id".equalsIgnoreCase(varValueArry[i].trim()))
{ {
...@@ -9821,7 +9821,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -9821,7 +9821,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
} }
else else
{ {
docValue = genericUtility.getColumnValue(varValueArry[i].trim(),headerDom).trim(); docValue = checkNull(genericUtility.getColumnValue(varValueArry[i].trim(),headerDom)).trim();
} }
if (docKey != "" && docKey.trim().length() > 0) if (docKey != "" && docKey.trim().length() > 0)
......
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