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

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

@@ -1145,7 +1145,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						
 						if (invoiceId == null || invoiceId.trim().length() == 0 || "null".equalsIgnoreCase( invoiceId.trim() ) )
 						{
-							valueXmlString.append("<line_no__inv protect =\"0\">").append("<![CDATA["+""+"]]>").append("</line_no__inv>");
+								
+							valueXmlString.append("<line_no__inv protect =\"1\">").append("<![CDATA["+""+"]]>").append("</line_no__inv>");
 							valueXmlString.append("<item_code protect =\"0\">").append("<![CDATA["+""+"]]>").append("</item_code>");
 						}
 						else
@@ -2366,6 +2367,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 								valueXmlString.append(reStr);
 							}//end if invoice id
 						}// end of line_no__inv
+						//Added by kunal for itemchange of line_no__invtrace D18CKOY001 
 						else if (currentColumn.trim().equals("line_no__invtrace") )
 						{
 
@@ -7083,7 +7085,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 				}
 				for (int colCtr = 0; colCtr <= colCount; colCtr++)
 				{
-					colName = col[colCtr];				
+					colName = col[colCtr];			
+					//Changed by kunal D18CKOY001
 					//if ( "site_code".equalsIgnoreCase(colName.trim()) || "invoice_id".equalsIgnoreCase(colName.trim()) || "cust_code".equalsIgnoreCase(colName.trim()) )
 					if ( "site_code".equalsIgnoreCase(colName.trim())  || "cust_code".equalsIgnoreCase(colName.trim()) )
 					{
@@ -7099,6 +7102,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 					}
 					else
 					{
+						//Changed by kunal D18CKOY001
 						docKey = docValue.trim();
 					}
 				}

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

@@ -413,6 +413,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 			{
 				invoiceIdDet	= checkNull(rs.getString("invoice_id"));
 				lineNoInv 		= rs.getDouble("line_no__inv");
+				//Added by kunal line_no__invtrace  D18CKOY001 
 				lineNoInvtrace  = rs.getDouble("line_no__invtrace");
 				itemCode 		= checkNull(rs.getString("item_code"));
 				quantity		= rs.getDouble("quantity");
@@ -576,10 +577,13 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				// 21/11/11 manoharan check whether to consider cr_term, ship_to_zip_code in splitcode
 				if (crCount > 0 )
 				{
-					tempSplitCode = itemSerDet+"@"+crterm+"@"+custCd+"@"+invoiceIdDet+"@"+statusDet; // **************** this need to be changed as per taro requirement
+					//tempSplitCode = itemSerDet+"@"+crterm+"@"+custCd; // **************** this need to be changed as per taro requirement
+					tempSplitCode = itemSerDet+"@"+crterm+"@"+custCd+"@"+invoiceIdDet+"@"+statusDet;
 				}
 				else
 				{
+					//Added by kunal   D18CKOY001
+					//tempSplitCode = itemSerDet
 					tempSplitCode = itemSerDet+"@"+invoiceIdDet+"@"+statusDet;
 				}
 				// end 21/11/11 manoharan check whether to consider cr_term, ship_to_zip_code in splitcode
@@ -599,6 +603,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				tempMap.put("invoice_id", invoiceIdDet);
 
 				tempMap.put("line_no__inv", ("" + lineNoInv));
+				//Added by kunal line_no__invtrace  D18CKOY001
 				tempMap.put("line_no__invtrace", ("" + lineNoInvtrace));
 				
 				tempMap.put("item_code", itemCode);
@@ -939,6 +944,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 					{
 						xmlBuff.append("<line_no__inv/>");
 					}
+					//Added by kunal line_no__invtrace  D18CKOY001
 					if ( tempMap.get("line_no__invtrace") != null )
 					{
 						xmlBuff.append("<line_no__invtrace>" + (String)tempMap.get("line_no__invtrace") + "</line_no__invtrace>");