Skip to content

B
business-java
Commit 44a6c6a0 authored by manohar's avatar manohar
Browse files
Options

ret_opt taken from header in itm_defaultedit of form 2 also existing values of... 

ret_opt taken from header in itm_defaultedit of form 2 also existing values of tax_chap, tax_class and tax_env assigned while protect/unprotect of the same


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93989 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 71737f4b
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 10 deletions
webitm-dis/ibase/webitm/ejb/dis/SReturnForm.java
View file @ 44a6c6a0
...@@ -857,10 +857,19 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -857,10 +857,19 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit")) if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
{ {
tranId = genericUtility.getColumnValue("tran_id",dom); tranId = genericUtility.getColumnValue("tran_id",dom1);
retOpt = genericUtility.getColumnValue("ret_opt",dom); // 11/12/13 manoharan ret_opt is in header not detail, also check fo null and initialise with empty string
//retOpt = genericUtility.getColumnValue("ret_opt",dom);
sql = " select count(1) from sreturndet where tran_id = ? "; retOpt = genericUtility.getColumnValue("ret_opt",dom1);
taxEnv = genericUtility.getColumnValue("tax_env",dom);
taxChap = genericUtility.getColumnValue("tax_chap",dom);
taxClass = genericUtility.getColumnValue("tax_class",dom);
retOpt = retOpt == null ?"" : retOpt.trim();
taxEnv = taxEnv == null ?"" : taxEnv.trim();
taxChap = taxChap == null ?"" : taxChap.trim();
taxClass = taxClass == null ?"" : taxClass.trim();
// end 11/12/13 manoharan
sql = " select count(1) from SRETURN_FORM_DET where tran_id = ? ";
pstmt= conn.prepareStatement( sql ); pstmt= conn.prepareStatement( sql );
pstmt.setString( 1, tranId ); pstmt.setString( 1, tranId );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -883,15 +892,15 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -883,15 +892,15 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
if ("R".equalsIgnoreCase(retOpt)) if ("R".equalsIgnoreCase(retOpt))
{ {
valueXmlString.append("<tax_chap protect =\"1\">").append("<![CDATA["+""+"]]>").append("</tax_chap>"); valueXmlString.append("<tax_chap protect =\"1\">").append("<![CDATA["+taxChap+"]]>").append("</tax_chap>");
valueXmlString.append("<tax_class protect =\"1\">").append("<![CDATA["+""+"]]>").append("</tax_class>"); valueXmlString.append("<tax_class protect =\"1\">").append("<![CDATA["+taxClass+"]]>").append("</tax_class>");
valueXmlString.append("<tax_env protect =\"1\">").append("<![CDATA["+""+"]]>").append("</tax_env>"); valueXmlString.append("<tax_env protect =\"1\">").append("<![CDATA["+taxEnv+"]]>").append("</tax_env>");
} }
else else
{ {
valueXmlString.append("<tax_chap protect =\"0\">").append("<![CDATA["+""+"]]>").append("</tax_chap>"); valueXmlString.append("<tax_chap protect =\"0\">").append("<![CDATA["+taxChap+"]]>").append("</tax_chap>");
valueXmlString.append("<tax_class protect =\"0\">").append("<![CDATA["+""+"]]>").append("</tax_class>"); valueXmlString.append("<tax_class protect =\"0\">").append("<![CDATA["+taxClass+"]]>").append("</tax_class>");
valueXmlString.append("<tax_env protect =\"0\">").append("<![CDATA["+""+"]]>").append("</tax_env>"); valueXmlString.append("<tax_env protect =\"0\">").append("<![CDATA["+taxEnv+"]]>").append("</tax_env>");
} }
} }
if(currentColumn.trim().equalsIgnoreCase("itm_default")) if(currentColumn.trim().equalsIgnoreCase("itm_default"))
......
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