Set Default ret_opt='c' and tran_code from invoice table

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

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

@@ -308,7 +308,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						{
 							valueXmlString.append("<price_list__clg protect =\"0\">").append("").append("</price_list__clg>");	
 						}
-						valueXmlString.append("<ret_opt protect =\"0\">").append("").append("</ret_opt>");	
+						//valueXmlString.append("<ret_opt protect =\"0\">").append("").append("</ret_opt>");	
 						valueXmlString.append("<exch_rate protect =\"0\">").append("0").append("</exch_rate>");	
 						
 					}
@@ -332,7 +332,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						{
 							sql = " select tran_mode, site_code, cust_code__bil, curr_code, " 
 								+ " exch_rate, anal_code, item_ser, tran_date, sales_pers, "
-								+ " cust_code, sale_order, sales_pers__1, sales_pers__2 "
+								+ " cust_code, sale_order, sales_pers__1, sales_pers__2,tran_code "
 								+ " from invoice where invoice_id = ? ";
 							pstmt= conn.prepareStatement( sql );
 							pstmt.setString( 1, invoiceId );
@@ -353,6 +353,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 								saleOrder = rs.getString(11); 
 								salesPers1 = rs.getString(12); 
 								salesPers2 = rs.getString(13); 
+								tranCode=rs.getString("tran_code");//Added by manoj sharma 05112012 to set transporter from invoice
 							}
 							rs.close();
 							pstmt.close();
@@ -446,7 +447,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							if( rs.next() )
 							{
 								custName = rs.getString(1); 
-								tranCode = rs.getString(2);
+								tranCode = tranCode == null ?rs.getString(2) : tranCode.trim();//Added by manoj sharma 05112012 to set transporter from invoice
 							}
 							rs.close();
 							pstmt.close();