cust_name__credit and cust_name_bat replaced in place of cust_cr_name and cust_end_name

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

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

@@ -476,7 +476,26 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 								saleRetQty = genericUtility.getColumnValue( "sale_ret_qty", dom );
 								unconfQty = genericUtility.getColumnValue( "unconf_claimed", dom );
 								confQty = genericUtility.getColumnValue( "conf_claimed", dom );
-								
+								if (quantity == null || "null".equals(quantity))
+								{
+									quantity = "0";
+								}
+								if (saleQty == null || "null".equals(saleQty))
+								{
+									saleQty = "0";
+								}
+								if (saleRetQty == null || "null".equals(saleRetQty))
+								{
+									saleRetQty = "0";
+								}
+								if (unconfQty == null || "null".equals(unconfQty))
+								{
+									unconfQty = "0";
+								}
+								if (confQty == null || "null".equals(confQty))
+								{
+									confQty = "0";
+								}
 								double qtyDbl = Double.parseDouble(quantity);
 								double saleQtyDbl = Double.parseDouble(saleQty);
 								double saleRetQtyDbl = Double.parseDouble(saleRetQty);
@@ -780,7 +799,7 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 								pStmt = null;
 							}
 						}
-						valueXmlString.append("<cust_end_name>").append("<![CDATA[" + ( custName )+ "]]>").append("</cust_end_name>");	
+						valueXmlString.append("<cust_name_bat>").append("<![CDATA[" + ( custName )+ "]]>").append("</cust_name_bat>");	
 						/*String siteCodeEdit = getColumnValue("site_code",dom);
 						String itemGrpEdit = getColumnValue("item_grp",dom);
 						String tranId = genericUtility.getColumnValue( "tran_id", dom );
@@ -909,7 +928,7 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 						}
 						valueXmlString.append("<cust_name>").append("<![CDATA[" + ( custName )+ "]]>").append("</cust_name>");	
 						valueXmlString.append("<cust_code__credit>").append("<![CDATA[" + ( custCode != null ? custCode.trim() : "" )+ "]]>").append("</cust_code__credit>");
-						valueXmlString.append("<cust_cr_name>").append("<![CDATA[" + ( custName )+ "]]>").append("</cust_cr_name>");
+						valueXmlString.append("<cust_name__credit>").append("<![CDATA[" + ( custName )+ "]]>").append("</cust_name__credit>");
 						valueXmlString.append("<price_list>").append("<![CDATA[" + ( priceList == null ? "" : priceList )+ "]]>").append("</price_list>");
 						valueXmlString.append("<item_ser>").append("<![CDATA[" + ( itemSeries )+ "]]>").append("</item_ser>");
 					}
@@ -917,7 +936,7 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 					{
 						type = genericUtility.getColumnValue( "type", dom );
 						valueXmlString.append("<cust_code__end>").append("").append("</cust_code__end>");
-						valueXmlString.append("<cust_end_name>").append("").append("</cust_end_name>");
+						valueXmlString.append("<cust_name_bat>").append("").append("</cust_name_bat>");
 						/* if( type != null )
 						{
 							valueXmlString.append("<cust_code__end protect=\"0\" >").append("").append("</cust_code__end>");
@@ -1039,7 +1058,7 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 							pStmt.close();
 							pStmt = null;
 						}
-						valueXmlString.append("<cust_cr_name>").append("<![CDATA[" + ( custName )+ "]]>").append("</cust_cr_name>");	
+						valueXmlString.append("<cust_name__credit>").append("<![CDATA[" + ( custName )+ "]]>").append("</cust_name__credit>");	
 					}
 					if (currentColumn.trim().equals( "cust_code__end" ))
 					{
@@ -1084,7 +1103,7 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 								pStmt = null;
 							}
 						}
-						valueXmlString.append("<cust_end_name>").append("<![CDATA[" + ( custName )+ "]]>").append("</cust_end_name>");	
+						valueXmlString.append("<cust_name_bat>").append("<![CDATA[" + ( custName )+ "]]>").append("</cust_name_bat>");	
 					}
 					if (currentColumn.trim().equals( "curr_code" ))
 					{