There are misc credit note created at diff customer and in misc credit note...

There are misc credit note created at diff customer and in misc credit note cust code dlv set to bill to customer in sale return(issue solved).

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

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

@@ -4196,7 +4196,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 						}
 					} 
 		
-					remarks=remarks.substring(0, remarks.length()-1);
+				//	remarks=remarks.substring(0, remarks.length()-1);
+					remarks=utilMethods.left(remarks, 60);
 					//end manish
 					xmlBuff.append("<remarks>").append("<![CDATA[" + remarks + "]]>").append("</remarks>");
 					
@@ -5199,7 +5200,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 							remarks = "Auto Generated Credit Note for Sales Return " + ls_tran_id;
 						}
 					} 
-					remarks=remarks.substring(0, remarks.length()-1);
+					//remarks=remarks.substring(0, remarks.length()-1);
+					remarks=utilMethods.left(remarks, 60);
 					//end manish
 					xmlBuff.append("<remarks>").append("<![CDATA[" + remarks + "]]>").append("</remarks>");
 					//xmlBuff.append("<remarks>").append("<![CDATA[" + "Against contract id:"+contractId+" from "+fromDateStr+" to "+toDateStr+" "+"]]>").append("</remarks>");
@@ -5790,7 +5792,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 			pstmt.close();
 			pstmt = null;
 		
-			
 			if ("D".equalsIgnoreCase(drcrFlag)) 
 			{
 					transer = "DRNRCP";
@@ -6244,7 +6245,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 						pstmt.setString(1, tranIdNew);
 						pstmt.setInt(2, lineNo);
 						pstmt.setString(3, invoiceId);
-						pstmt.setInt(4, lineNoInv);
+						//pstmt.setInt(4, lineNoInv);
+						pstmt.setNull(4, Types.INTEGER);
 						pstmt.setString(5, itemCode);
 						pstmt.setString(6, salesPers);
 						pstmt.setString(7, " ");
@@ -6849,7 +6851,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 		               	pstmt.setString(5,finEntity);
 		               	pstmt.setString(6,siteCodeAs);
 		               	pstmt.setString(7,sundryType);
-		               	pstmt.setString(8,sundryCode);
+		               	//pstmt.setString(8,sundryCode);
+		               	pstmt.setString(8,custCode);
 		               	pstmt.setString(9,acctCode);
 		               	pstmt.setString(10,cctrCode);
 		               	pstmt.setDouble(11,amount);
@@ -6881,7 +6884,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 		            	pstmt.setDouble(36,rndTo);
 		                pstmt.setString(37,refNoCr);
 		                pstmt.setString(38,wfStatus);
-		                pstmt.setString(39,custCode);
+		              //  pstmt.setString(39,custCode);
+		                pstmt.setString(39,sundryCode);
 		                pstmt.setString(40,custPord);
 		                pstmt.setTimestamp(41,pordDate);
 		                pstmt.setString(42,ediStat);