Commit 44f2d615 authored by mmhatre's avatar mmhatre

issue solved for expense voucher

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@217045 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8b683f52
...@@ -3905,13 +3905,13 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -3905,13 +3905,13 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
if(sundryTypePay.equalsIgnoreCase(sundryType)) if(sundryTypePay.equalsIgnoreCase(sundryType))
{ {
valueXmlString.append("<acct_code__pay protect = \"1\">").append("<![CDATA[" + acctCodePay + "]]>").append("</acct_code__pay>"); valueXmlString.append("<acct_code__pay protect = \"1\">").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__pay>");
valueXmlString.append("<acct_code__ap protect = \"1\">").append("<![CDATA[" + acctCodePay + "]]>").append("</acct_code__ap>"); valueXmlString.append("<acct_code__ap protect = \"1\">").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__ap>");
} }
else else
{ {
valueXmlString.append("<acct_code__pay protect = \"0\" >").append("<![CDATA[" + acctCodePay + "]]>").append("</acct_code__pay>"); valueXmlString.append("<acct_code__pay protect = \"0\" >").append("<![CDATA[" + acctCodePay + "]]>").append("</acct_code__pay>");
valueXmlString.append("<acct_code__ap protect = \"0\">").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__ap>"); valueXmlString.append("<acct_code__ap >").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__ap>");
} }
//end manish //end manish
} }
...@@ -3927,13 +3927,13 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -3927,13 +3927,13 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
if(sundryTypePay.equalsIgnoreCase(sundryType)) if(sundryTypePay.equalsIgnoreCase(sundryType))
{ {
valueXmlString.append("<acct_code__pay protect = \"1\">").append("<![CDATA[" + acctCodePay + "]]>").append("</acct_code__pay>"); valueXmlString.append("<acct_code__pay protect = \"1\">").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__pay>");
valueXmlString.append("<acct_code__ap protect = \"1\">").append("<![CDATA[" + acctCodePay + "]]>").append("</acct_code__ap>"); valueXmlString.append("<acct_code__ap protect = \"1\">").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__ap>");
} }
else else
{ {
valueXmlString.append("<acct_code__pay protect = \"0\" >").append("<![CDATA[" + acctCodePay + "]]>").append("</acct_code__pay>"); valueXmlString.append("<acct_code__pay protect = \"0\" >").append("<![CDATA[" + acctCodePay + "]]>").append("</acct_code__pay>");
valueXmlString.append("<acct_code__ap protect = \"0\">").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__ap>"); valueXmlString.append("<acct_code__ap >").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__ap>");
} }
} }
//end manish //end manish
...@@ -4032,12 +4032,29 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -4032,12 +4032,29 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
else if(currentColumn.trim().equalsIgnoreCase("sundry_type__pay")) else if(currentColumn.trim().equalsIgnoreCase("sundry_type__pay"))
{ {
sundryTypePay=genericUtility.getColumnValue("sundry_type__pay", dom);
sundryType= genericUtility.getColumnValue("sundry_type", dom);
acctCodeAp=genericUtility.getColumnValue("acct_code__ap", dom);
acctCodePay=genericUtility.getColumnValue("acct_code__pay", dom);
valueXmlString.append("<sundry_code__pay>").append("<![CDATA[" + "" + "]]>").append("</sundry_code__pay>"); valueXmlString.append("<sundry_code__pay>").append("<![CDATA[" + "" + "]]>").append("</sundry_code__pay>");
valueXmlString.append("<sundry_name_pay>").append("<![CDATA[" + "" + "]]>").append("</sundry_name_pay>"); valueXmlString.append("<sundry_name_pay>").append("<![CDATA[" + "" + "]]>").append("</sundry_name_pay>");
valueXmlString.append("<acct_code__pay>").append("<![CDATA[" + "" + "]]>").append("</acct_code__pay>"); valueXmlString.append("<acct_code__pay>").append("<![CDATA[" + "" + "]]>").append("</acct_code__pay>");
valueXmlString.append("<cctr_code__pay>").append("<![CDATA[" + "" + "]]>").append("</cctr_code__pay>"); valueXmlString.append("<cctr_code__pay>").append("<![CDATA[" + "" + "]]>").append("</cctr_code__pay>");
valueXmlString.append("<pay_acct_descr>").append("<![CDATA[" + "" + "]]>").append("</pay_acct_descr>"); valueXmlString.append("<pay_acct_descr>").append("<![CDATA[" + "" + "]]>").append("</pay_acct_descr>");
//added by manish mhatre on 17-feb-2020
//start manish
if(sundryTypePay.equalsIgnoreCase(sundryType))
{
valueXmlString.append("<acct_code__pay protect = \"1\">").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__pay>");
valueXmlString.append("<acct_code__ap protect = \"1\">").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__ap>");
}
else
{
valueXmlString.append("<acct_code__pay protect = \"0\" >").append("<![CDATA[" + acctCodePay + "]]>").append("</acct_code__pay>");
//valueXmlString.append("<acct_code__ap protect = \"0\">").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__ap>");
valueXmlString.append("<acct_code__ap >").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__ap>");
}
} }
else if(currentColumn.trim().equalsIgnoreCase("sundry_code__pay")) else if(currentColumn.trim().equalsIgnoreCase("sundry_code__pay"))
......
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