Added checkNull to tax_env and tax_class in supplier code column and removed the else condition

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@185458 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/POrderIC.java

@@ -6544,15 +6544,11 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 						if (taxclassDes == null || taxclassDes.trim().length() == 0) {
 							// taxclassDes =
 							// gf_get_taxclass('S',suppCode,"",siteCodeDlv)
-							taxclassDes = distComm.getTaxClass("S", suppCode,
-									"", siteCodeDlv, conn);
+							taxclassDes = checkNull(distComm.getTaxClass("S", suppCode,
+									"", siteCodeDlv, conn));
 							System.out.println("@@taxclassDes from distComm@@"+taxclassDes);
 						} 
-						else
-						{
-							taxclassDes = "";
-							System.out.println("@@taxclassDes as empty value@@"+taxclassDes);
-						}
+						
 						if (taxChap == null || taxChap.trim().length() == 0) {
 							// taxchapDes = gf_get_taxchap("", itemSer, 'S',
 							// suppCode,siteCodeDlv)
@@ -6566,30 +6562,25 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 							// taxenvDes = gf_get_taxenv(stationstanCode,
 							// stationCodeto, taxchapDes,
 							// taxclassDes,siteCodeDlv)
-							taxenvDes = distComm.getTaxEnv(stationstanCode,
+							taxenvDes = checkNull(distComm.getTaxEnv(stationstanCode,
 									stationCodeto, taxchapDes, taxclassDes,
-									siteCodeDlv, conn);
+									siteCodeDlv, conn));
 							System.out.println("@@taxenvDes from distComm@@"+taxenvDes);
 						} 
-						else 
-						{
-							taxenvDes = "";
-							System.out.println("@@taxenvDes as empty value@@"+taxenvDes);
-						}
 						
-					}
-					valueXmlString.append("<tax_class>")
-					.append("<![CDATA[" + taxclassDes + "]]>")
-					.append("</tax_class>");
-					
-			        valueXmlString.append("<tax_chap>")
-					.append("<![CDATA[" + taxchapDes + "]]>")
-					.append("</tax_chap>");
-			        
-			        valueXmlString.append("<tax_env>")
-					.append("<![CDATA[" + taxenvDes + "]]>")
-					.append("</tax_env>");
-			        
+						valueXmlString.append("<tax_class>")
+						.append("<![CDATA[" + taxclassDes + "]]>")
+						.append("</tax_class>");
+						
+				        valueXmlString.append("<tax_chap>")
+						.append("<![CDATA[" + taxchapDes + "]]>")
+						.append("</tax_chap>");
+				        
+				        valueXmlString.append("<tax_env>")
+						.append("<![CDATA[" + taxenvDes + "]]>")
+						.append("</tax_env>");
+					}
+						        
 					valueXmlString.append("<price_list__clg>")
 							.append("<![CDATA[" + priceListClg + "]]>")
 							.append("</price_list__clg>");