Skip to content

B
business-java
Commit ffe67e1a authored by mmhatre's avatar mmhatre
Browse files
Options

acct_code__ap and acct_code__pay are non editable when site_code and site_code__pay are same. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216741 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8194700c
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 0 deletions
webitm-fin/src/ibase/webitm/ejb/fin/MiscVoucherIC.java
View file @ ffe67e1a
...@@ -3011,6 +3011,10 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -3011,6 +3011,10 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
else if(currentColumn.trim().equalsIgnoreCase("sundry_code")) else if(currentColumn.trim().equalsIgnoreCase("sundry_code"))
{ {
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);
String lsSiteCodePay=""; String lsSiteCodePay="";
sundryCode = genericUtility.getColumnValue("sundry_code", dom); sundryCode = genericUtility.getColumnValue("sundry_code", dom);
sundryType = genericUtility.getColumnValue("sundry_type", dom); sundryType = genericUtility.getColumnValue("sundry_type", dom);
...@@ -3895,7 +3899,44 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -3895,7 +3899,44 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
valueXmlString.append("<rnd_off>").append("<![CDATA[" + payRndOff + "]]>").append("</rnd_off>"); valueXmlString.append("<rnd_off>").append("<![CDATA[" + payRndOff + "]]>").append("</rnd_off>");
valueXmlString.append("<rnd_to>").append("<![CDATA[" + payRndTo + "]]>").append("</rnd_to>"); valueXmlString.append("<rnd_to>").append("<![CDATA[" + payRndTo + "]]>").append("</rnd_to>");
//Ended by Varsha V on 27-09-18 for taking round to from sundry master //Ended by Varsha V on 27-09-18 for taking round to from sundry master
//added by manish mhatre on 17-feb-2020
//start manish
if(sundryTypePay.equalsIgnoreCase(sundryType))
{
valueXmlString.append("<acct_code__pay protect = \"1\">").append("<![CDATA[" + acctCodePay + "]]>").append("</acct_code__pay>");
valueXmlString.append("<acct_code__ap protect = \"1\">").append("<![CDATA[" + acctCodePay + "]]>").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>");
}
//end manish
}
//added by manish mhatre on 17-feb-2020
//start manish
else if(currentColumn.trim().equalsIgnoreCase("sundry_type"))
{
System.out.println("inside sundry type");
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);
if(sundryTypePay.equalsIgnoreCase(sundryType))
{
valueXmlString.append("<acct_code__pay protect = \"1\">").append("<![CDATA[" + acctCodePay + "]]>").append("</acct_code__pay>");
valueXmlString.append("<acct_code__ap protect = \"1\">").append("<![CDATA[" + acctCodePay + "]]>").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>");
}
}
//end manish
else if(currentColumn.trim().equalsIgnoreCase("order_ref")) else if(currentColumn.trim().equalsIgnoreCase("order_ref"))
{ {
orderRef = genericUtility.getColumnValue("order_ref", dom); orderRef = genericUtility.getColumnValue("order_ref", dom);
...@@ -3996,6 +4037,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -3996,6 +4037,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
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>");
} }
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