Changed by Manish on 05/03/16 for DDUK.

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

webitm-wms/ibase/webitm/ejb/wms/UploadOrderEJB.java

@@ -371,6 +371,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 											isError = true;
 											writeLogAndSendMail(saleOrderNo,retString,conn);
 											//return retString;
+											return "Success "+saleOrderNo+" Error on Confirm ";  // change by manish on 05/03/2016 to return success msg to ERP if order is not confirm.
 										}
 									}
 									rs.close();
@@ -389,6 +390,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 									isError = true;
 									writeLogAndSendMail(saleOrderNo,retString,conn);
 									//return retString; //Error could not return to Magento server
+									return "Success "+saleOrderNo+ " Error on Confirm ";  // change by manish on 05/03/2016 to return success msg to ERP if order is not confirm.
 								}
 							}
 							else
@@ -398,6 +400,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 								retString = itmDBAccessEJB.getErrorString("","VTTAXMGTO","","",conn);
 								writeLogAndSendMail(saleOrderNo,retString,conn);
 								//return retString; //Error could not return to Magento server
+								return "Success "+saleOrderNo+ " Error on Confirm ";  // change by manish on 05/03/2016 to return success msg to ERP if order is not confirm.
 							}
 						}
 						else