Skip to content

B
business-java
Commit d8082c5d authored by msalla's avatar msalla
Browse files
Options

Purchase return tax mapping issue 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@207191 ce508802-f39f-4f6c-b175-0d175dae99d5
parent bc30b362
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 16 deletions
webitm-dis/src/ibase/webitm/ejb/dis/PoReturnIC.java
View file @ d8082c5d
......@@ -2308,7 +2308,7 @@ PoReturnICRemote {
}
//Pavan Rane 09sep19 start[to validate line item lot on porcpdet]
tranIdRcp = checkNull(genericUtility.getColumnValue("tran_id__rcp",dom));
/*tranIdRcp = checkNull(genericUtility.getColumnValue("tran_id__rcp",dom));
lineNoRcp = checkNull(genericUtility.getColumnValue("line_no__rcp", dom));
System.out.println("Validation LotNo["+tranIdRcp+"]lineNoRcp["+lineNoRcp+"]ls_item["+ls_item+"]ls_stock_lotno["+ls_stock_lotno+"]");
if(tranIdRcp != null && tranIdRcp.trim().length() > 0)
......@@ -2342,7 +2342,7 @@ PoReturnICRemote {
errFields.add(childNodeName.toLowerCase());
}
}
}*/
//Pavan Rane 09sep19 end[to validate line item lot on porcpdet]
}
//Added by sarita for line_no__rcp Validation on 16 OCT 2018 [START]
......@@ -4017,7 +4017,7 @@ PoReturnICRemote {
String blankVar=" ";
String isNull=null;
String quantity = "";
String mRtConvStr = "", mrate1 = "";
String mRtConvStr = "", mrate1 = "",taxChap="",taxClass="",taxEnv="",purcOrder="";
String ls_tranID = "", ls_tranIdRef = "";
String mQtyConvStr = "";
String mPordLine1="";
......@@ -4082,6 +4082,14 @@ PoReturnICRemote {
"tran_id", dom));
ls_tranid_rcp = checkNull(genericUtility.getColumnValue(
"tran_id__rcp", dom));
//added by monika-11 sept 2019--
taxChap =checkNull(genericUtility.getColumnValue("tax_chap",dom));
taxClass =checkNull(genericUtility.getColumnValue("tax_class",dom));
taxEnv = checkNull(genericUtility.getColumnValue("tax_env",dom));
purcOrder=checkNull(genericUtility.getColumnValue("purc_order",dom));
//end
if (ls_retopt.equalsIgnoreCase("C")) {
ls_allowtax = "Y";
} else {
......@@ -4092,24 +4100,34 @@ PoReturnICRemote {
}
if (ls_allowtax.equalsIgnoreCase("Y")) {
valueXmlString.append("<tax_chap protect =\"0\">")
//commented by monika 10 sept 2019
/*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 {
valueXmlString.append("<tax_chap protect =\"1\">")
.append("<![CDATA[]]>").append("</tax_env>");*/
//added by monika-11 sept 2019--
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>");
//end
}
else
{
//commented by monika 10 sept 2019
/*valueXmlString.append("<tax_chap protect =\"1\">")
.append("<![CDATA[]]>").append("</tax_chap>");
valueXmlString.append("<tax_class protect =\"1\">")
.append("<![CDATA[]]>").append("</tax_class>");
valueXmlString.append("<tax_env protect =\"1\">")
.append("<![CDATA[]]>").append("</tax_env>");
*/
//added by monika-11 sept 2019--
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>");
//end
}
......@@ -4127,11 +4145,18 @@ PoReturnICRemote {
pstmt.close();
pstmt = null;
if (ls_singleord.equals("Y")) {
valueXmlString.append("<purc_order protect =\"1\">")
.append("<![CDATA[]]>").append("</purc_order>");
//commented by monika 10 sept 2019
/*valueXmlString.append("<purc_order protect =\"1\">")
.append("<![CDATA[]]>").append("</purc_order>");*/
//added by monika 10 sept 2019
valueXmlString.append("<purc_order protect =\"1\">").append("<![CDATA[" + purcOrder + "]]>").append("</purc_order>");
//end
} else {
valueXmlString.append("<purc_order protect =\"0\">")
.append("<![CDATA[]]>").append("</purc_order>");
//commented by monika 10 sept 2019
/*valueXmlString.append("<purc_order protect =\"0\">")
.append("<![CDATA[]]>").append("</purc_order>");*/
valueXmlString.append("<purc_order protect =\"0\">").append("<![CDATA[" + purcOrder + "]]>").append("</purc_order>");
//end
}
//Added by sarita on 16 OCT 2018 to set rate using price_list type [START]
......
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