Bug fix

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

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

@@ -1222,7 +1222,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 
 			ls_loc_code_git = distCommon.getDisparams( "999999", "TRANSIT_LOC", conn);
 
-			if( "Y".equalsIgnoreCase(ls_channel_partner) && ("E".equalsIgnoreCase(ls_dis_link) || "A".equalsIgnoreCase(ls_dis_link)))
+			if( "Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
 			{
 				sql = "Select inv_stat From location Where loc_code	= ? ";
 				pstmt=conn.prepareStatement(sql);
@@ -1545,7 +1545,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 						return merrcode;
 					}
 				
-					if("Y".equalsIgnoreCase(ls_channel_partner) && ("E".equalsIgnoreCase(ls_dis_link) ||"A".equalsIgnoreCase(ls_dis_link)))
+					if("Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
 					{
 						stockUpd.put("inv_stat",ls_tran_stat);
 						stockUpd.put("loc_code",ls_loc_code_git);
@@ -1816,7 +1816,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 						return merrcode;
 					}
 		
-					if("Y".equalsIgnoreCase(ls_channel_partner) && ("E".equalsIgnoreCase(ls_dis_link) ||"A".equalsIgnoreCase(ls_dis_link)))
+					if("Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
 					{
 						stockUpd.put("inv_stat",ls_tran_stat);
 						stockUpd.put("loc_code",ls_loc_code_git);
@@ -3444,8 +3444,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 				
 				//Changed by wasim to insert into header [START]
 				System.out.println("Old CustCode["+ls_old_cust_code+"] CustCode["+ls_cust_code+"] ls_old_item_ser["+ls_old_item_ser+"] ItemSer["+ls_item_ser+"]");
-				if(ls_old_cust_code != ls_cust_code || ls_old_item_ser != ls_item_ser)
+				
+				if( ! ls_old_cust_code.equalsIgnoreCase(ls_cust_code))//  || ! ls_old_item_ser.equalsIgnoreCase(ls_item_ser) )
 				{
+					System.out.println("Inside header loop");
 					sql = "select fin_entity, acct_code__ar, cctr_code__ar, due_date, gp_no, gp_date from invoice where invoice_id = ? ";
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, ls_invoice_id);
@@ -3528,6 +3530,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					pstmt1.setString( 32, ls_ret_ref );
 					pstmt1.setString( 33, "N" );
 
+					ls_old_cust_code = ls_cust_code.trim();
 					//int cnt=pstmt1.executeUpdate();
 					if(pstmt1 != null)
 					{