Bug fix

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

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

@@ -1151,7 +1151,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						}
 						else
 						{
-							valueXmlString.append("<invoice_id>").append("<![CDATA[" + invoiceId + "]]>").append("</invoice_id>");
+							valueXmlString.append("<invoice_id protect =\"1\">").append("<![CDATA[" + invoiceId + "]]>").append("</invoice_id>");
 							valueXmlString.append("<line_no__inv protect =\"0\">").append("<![CDATA["+""+"]]>").append("</line_no__inv>");
 							valueXmlString.append("<item_code protect =\"1\">").append("<![CDATA["+""+"]]>").append("</item_code>");
 						}
@@ -5129,6 +5129,16 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 									//break;
 									errList.add( errCode );
 									errFields.add( childNodeName.toLowerCase() );
+								}
+								else
+								{
+									
+										errCode = "VTNODETINV";
+										errList.add( errCode );
+										errFields.add( childNodeName.toLowerCase() );
+									
+									
+									
 								}
 							}
 						}

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

@@ -212,7 +212,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 
 		java.sql.Timestamp tranDate	= null, effDate	= null, lrDate = null;
 
-		String tranType = "", invoiceId = "", custCode = "", itemSer = "", retOpt = "",itemSer1 = "";
+		String tranType = "", invoiceId = "", custCode = "", itemSer = "", retOpt = "",itemSer1 = "",invoice1="";
 		String siteCode = "", projCode = "", analCode = "", remarks = "", fullRet = "";
 		String currCode = "", custRef = "", tranCode = "", lrNo = "", lorryNo = "", transMode = "";
 		String currCodeBC = "", priceList = "", priceListClg = "";
@@ -578,7 +578,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				if (crCount > 0 )
 				{
 					//tempSplitCode = itemSerDet+"@"+crterm+"@"+custCd; // **************** this need to be changed as per taro requirement
-					tempSplitCode = itemSerDet+"@"+crterm+"@"+custCd+"@"+invoiceIdDet+"@"+statusDet;
+					tempSplitCode = itemSerDet+"@"+invoiceIdDet+"@"+custCd+"@"+crterm+"@"+statusDet;
 				}
 				else
 				{
@@ -719,6 +719,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				if(splitCode.split("@").length != 0)
 				{	
 					itemSer1 = checkNull(splitCode.split("@")[0]);
+					invoice1 = checkNull(splitCode.split("@")[1]);
 				}	
 				//crterm = checkNull(tempstr[1]);
 				//shiptozip = checkNull(tempstr[2]);
@@ -771,7 +772,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				xmlBuff.append("<tran_type><![CDATA["+ tranType +"]]></tran_type>");
 				//xmlBuff.append("<eff_date><![CDATA["+ sdf.parse(effDate.toString()) +"]]></eff_date>");
 				xmlBuff.append("<eff_date><![CDATA["+ sdf.format(effDate).toString() +"]]></eff_date>");
-				//xmlBuff.append("<invoice_id><![CDATA["+ invoiceId +"]]></invoice_id>");
+				xmlBuff.append("<invoice_id><![CDATA["+ invoice1 +"]]></invoice_id>");
 
 				xmlBuff.append("<cust_code><![CDATA["+ custCode +"]]></cust_code>");
 				//************** to get the item_ser from
@@ -785,8 +786,8 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				xmlBuff.append("<proj_code><![CDATA["+ projCode +"]]></proj_code>");
 				xmlBuff.append("<anal_code><![CDATA["+ analCode +"]]></anal_code>");
 				xmlBuff.append("<remarks><![CDATA["+ remarks +"]]></remarks>");
-				//xmlBuff.append("<full_ret><![CDATA["+ fullRet +"]]></full_ret>");
-				xmlBuff.append("<full_ret><![CDATA["+ "Y" +"]]></full_ret>");
+				xmlBuff.append("<full_ret><![CDATA["+ fullRet +"]]></full_ret>");
+				//xmlBuff.append("<full_ret><![CDATA["+ "Y" +"]]></full_ret>");
 				
 				xmlBuff.append("<curr_code><![CDATA["+ currCode +"]]></curr_code>");
 				xmlBuff.append("<exch_rate><![CDATA["+ exchRate +"]]></exch_rate>");