Skip to content

B
business-java
Commit 7d406797 authored by prane's avatar prane
Browse files
Options

condition of taxes checking null is removed on itemchnage of cust_code__bil... 

condition of taxes checking null is removed on itemchnage of cust_code__bil nad cr_term-descr bug fixed

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@188071 ce508802-f39f-4f6c-b175-0d175dae99d5
parent aba511b2
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 13 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesOrderIC.java
View file @ 7d406797
...@@ -5245,16 +5245,16 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -5245,16 +5245,16 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if (taxChapHdr == null || taxChapHdr.trim().length() == 0) { //if (taxChapHdr == null || taxChapHdr.trim().length() == 0) {
taxChapHdr = distCommon.getTaxChap("", mItemSer, "C", custCodeTax, siteCodeShip, conn); taxChapHdr = distCommon.getTaxChap("", mItemSer, "C", custCodeTax, siteCodeShip, conn);
} //}
if (taxClassHdr == null || taxClassHdr.trim().length() == 0) { //if (taxClassHdr == null || taxClassHdr.trim().length() == 0) {
taxClassHdr = distCommon.getTaxClass("C", custCodeTax, "", siteCodeShip, conn); taxClassHdr = distCommon.getTaxClass("C", custCodeTax, "", siteCodeShip, conn);
} //}
if (taxEnvHdr == null || taxEnvHdr.trim().length() == 0) { //if (taxEnvHdr == null || taxEnvHdr.trim().length() == 0) {
taxEnvHdr = distCommon.getTaxEnv(stanCodeFr, stanCodeTo, taxChapHdr, taxClassHdr, siteCodeShip, conn); taxEnvHdr = distCommon.getTaxEnv(stanCodeFr, stanCodeTo, taxChapHdr, taxClassHdr, siteCodeShip, conn);
} //}
valueXmlString.append("<tax_class>").append("<![CDATA[" + taxClassHdr + "]]>").append("</tax_class>"); valueXmlString.append("<tax_class>").append("<![CDATA[" + taxClassHdr + "]]>").append("</tax_class>");
setNodeValue(dom, "tax_class", getAbsString(taxClassHdr)); setNodeValue(dom, "tax_class", getAbsString(taxClassHdr));
valueXmlString.append("<tax_chap>").append("<![CDATA[" + taxChapHdr + "]]>").append("</tax_chap>"); valueXmlString.append("<tax_chap>").append("<![CDATA[" + taxChapHdr + "]]>").append("</tax_chap>");
...@@ -5401,10 +5401,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -5401,10 +5401,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
rs.close(); rs.close();
rs = null; rs = null;
valueXmlString.append("<crterm_descr>").append("<![CDATA[" + descr + "]]>") valueXmlString.append("<crterm_descr>").append("<![CDATA[" + descr + "]]>").append("</crterm_descr>");
.append("</crterm_descr>"); //commented as cr_trem desc set instead of cr_trerm
/*sql = "select descr from crterm where cr_term =?";
sql = "select descr from crterm where cr_term =?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mcrTerm); pstmt.setString(1, mcrTerm);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -5415,8 +5414,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -5415,8 +5414,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
pstmt = null; pstmt = null;
rs.close(); rs.close();
rs = null; rs = null;
*/
valueXmlString.append("<cr_term>").append("<![CDATA[" + descr + "]]>").append("</cr_term>"); //valueXmlString.append("<cr_term>").append("<![CDATA[" + descr + "]]>").append("</cr_term>");
sql = "select curr_code , bank_code , rcp_mode, chq_name from customer where cust_code =?"; sql = "select curr_code , bank_code , rcp_mode, chq_name from customer where cust_code =?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
......
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