scheme description overwritten in case of price_list__dis in site_customer

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

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

@@ -3386,10 +3386,11 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
 										+" case when pricelist.rate_type = 'P' then '%' else 'Fix' end as rate_type, "
 										+"pricelist.price_list price_list" 
 										+" from	site_customer ,pricelist "  
-										+" where site_customer.price_list__disc = pricelist.price_list  and " 
-										+" site_customer.site_code = ?  and "  
-										+"site_customer.cust_code = ? and  "
-										+" pricelist.item_code = ? "   ;
+										+" where site_customer.price_list__disc = pricelist.price_list " 
+										+" and site_customer.site_code = ? "  
+										+" and site_customer.cust_code = ? "
+										+" and pricelist.item_code = ? "  
+										+" and site_customer.price_list__disc is not null" ;
 									pstmt= conn.prepareStatement(sql);		
 									pstmt.setString(1,siteCode);	
 									pstmt.setString(2,custCode);	
@@ -3397,11 +3398,15 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
 									rs = pstmt.executeQuery();
 									if(rs.next())
 									{
+										if (lsDescr ==null)
+										{
+											lsDescr = "";
+										}
 										lcRate =rs.getString("rate") == null ? "" : rs.getString("rate");
 										lsType =rs.getString("rate_type") == null ? "" : rs.getString("rate_type");
 										lsPriceList =rs.getString("price_list") == null ? "" : rs.getString("price_list");
-										valueXmlString.append("<st_scheme>").append("<![CDATA[Integral Quantity :"+integralQty+ "Price List Disc :"+priceList+ " Rate : "+lcRate+ " " +lsType+"]]>").append("</st_scheme>");
-										valueXmlString.append("<st_scheme>").append("<![CDATA[Integral Quantity :"+integralQty+"]]>").append("</st_scheme>"); 
+										valueXmlString.append("<st_scheme>").append("<![CDATA[" + lsDescr + " Integral Quantity :"+integralQty+ "Price List Disc :"+priceList+ " Rate : "+lcRate+ " " +lsType+"]]>").append("</st_scheme>");
+										//valueXmlString.append("<st_scheme>").append("<![CDATA[Integral Quantity :"+integralQty+"]]>").append("</st_scheme>"); 
 									}
 									rs.close();
 									pstmt.close();