return_type column is set from during split if tran_type is blank

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

webitm-dis/ibase/webitm/ejb/dis/adv/SalesReturnFormSplit.java

@@ -316,7 +316,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				+ " anal_code, remarks, full_ret, curr_code, exch_rate, "
 				+ " cust_ref, net_amt, tran_code, lr_no, lr_date, lorry_no, "
 				+ " frt_amt, trans_mode, bank_charges, curr_code__bc, price_list, "
-				+ " eff_net_amt, tax_amt, price_list__clg,ret_ref  "
+				+ " eff_net_amt, tax_amt, price_list__clg,ret_ref,return_type  "
 				+ " FROM sreturn_form "
 				+ " WHERE sreturn_form.tran_id = ? ";
 
@@ -326,7 +326,12 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 			if ( rs.next() )
 			{
 				tranDate	= rs.getTimestamp("tran_date");
-				tranType	= rs.getString("tran_type");
+				//tranType	= rs.getString("tran_type");//Commented by Manoj dtd 13022013 to use return_type column
+				tranType	= checkNull(rs.getString("return_type"));
+				if(tranType.trim().length()==0)
+				{
+					tranType	= checkNull(rs.getString("tran_type"));
+				}
 				effDate		= rs.getTimestamp("eff_date");
 				invoiceId	= checkNull(rs.getString("invoice_id"));
 				custCode	= checkNull(rs.getString("cust_code"));