0041867: Void Layaway errors generate Import entry errors instead of Errors While importing

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1570170869 -19800
#      Fri Oct 04 12:04:29 2019 +0530
# Node ID a4467b9cabb4de4350f43963958bc40c9027ca7a
# Parent  6bad5364a88d94bc0a9833925bbd118785c8e1c6
Related to issue 41867 : Added DataSynchronization annotation to Void Layaway Process

diff -r 6bad5364a88d -r a4467b9cabb4 src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml	Fri Oct 04 12:04:21 2019 +0530
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml	Fri Oct 04 12:04:29 2019 +0530
@@ -1190,6 +1190,17 @@
 <!--59099FCCF38A4A8DBD7B91CD463E93CD-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
 <!--59099FCCF38A4A8DBD7B91CD463E93CD--></AD_REF_LIST>
 
+<!--5B274EE4EC9241B3A0B525476547791A--><AD_REF_LIST>
+<!--5B274EE4EC9241B3A0B525476547791A-->  <AD_REF_LIST_ID><![CDATA[5B274EE4EC9241B3A0B525476547791A]]></AD_REF_LIST_ID>
+<!--5B274EE4EC9241B3A0B525476547791A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5B274EE4EC9241B3A0B525476547791A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5B274EE4EC9241B3A0B525476547791A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5B274EE4EC9241B3A0B525476547791A-->  <VALUE><![CDATA[OBPOS_VoidLayaway]]></VALUE>
+<!--5B274EE4EC9241B3A0B525476547791A-->  <NAME><![CDATA[Void Layaway]]></NAME>
+<!--5B274EE4EC9241B3A0B525476547791A-->  <AD_REFERENCE_ID><![CDATA[20A228A295C844C68B4451622057A893]]></AD_REFERENCE_ID>
+<!--5B274EE4EC9241B3A0B525476547791A-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--5B274EE4EC9241B3A0B525476547791A--></AD_REF_LIST>
+
 <!--5B53279E92A346FD848DDC4A958A6031--><AD_REF_LIST>
 <!--5B53279E92A346FD848DDC4A958A6031-->  <AD_REF_LIST_ID><![CDATA[5B53279E92A346FD848DDC4A958A6031]]></AD_REF_LIST_ID>
 <!--5B53279E92A346FD848DDC4A958A6031-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 6bad5364a88d -r a4467b9cabb4 src/org/openbravo/retail/posterminal/CancelLayawayLoader.java
--- a/src/org/openbravo/retail/posterminal/CancelLayawayLoader.java	Fri Oct 04 12:04:21 2019 +0530
+++ b/src/org/openbravo/retail/posterminal/CancelLayawayLoader.java	Fri Oct 04 12:04:29 2019 +0530
@@ -139,7 +139,7 @@
           useOrderDocumentNoForRelatedDocs);
     } catch (Exception ex) {
       OBDal.getInstance().rollbackAndClose();
-      throw new OBException("CancelLayawayLoader.cancelOrder: ", ex);
+      throw new OBException("Error in CancelLayawayLoader : " + ex.getMessage(), ex);
     } finally {
       TriggerHandler.getInstance().enable();
     }
diff -r 6bad5364a88d -r a4467b9cabb4 src/org/openbravo/retail/posterminal/ExternalOrderLoaderErrorHandler.java
--- a/src/org/openbravo/retail/posterminal/ExternalOrderLoaderErrorHandler.java	Fri Oct 04 12:04:21 2019 +0530
+++ b/src/org/openbravo/retail/posterminal/ExternalOrderLoaderErrorHandler.java	Fri Oct 04 12:04:29 2019 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2015 Openbravo S.L.U.
+ * Copyright (C) 2015-2019 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -11,7 +11,6 @@
 import javax.enterprise.context.ApplicationScoped;
 
 import org.codehaus.jettison.json.JSONObject;
-import org.openbravo.base.model.Entity;
 import org.openbravo.client.kernel.ComponentProvider.Qualifier;
 import org.openbravo.service.db.DbUtility;
 
@@ -22,12 +21,13 @@
 public class ExternalOrderLoaderErrorHandler extends POSDataSynchronizationErrorHandler {
 
   @Override
-  public void handleError(Throwable t, Entity entity, JSONObject result, JSONObject jsonRecord) {
+  public void handleError(Throwable t, String typeOfData, JSONObject result,
+      JSONObject jsonRecord) {
     if (ExternalOrderLoader.isSynchronizedRequest()) {
       ExternalOrderLoader.setCurrentException(DbUtility.getUnderlyingSQLException(t));
       return;
     }
-    super.handleError(t, entity, result, jsonRecord);
+    super.handleError(t, typeOfData, result, jsonRecord);
   }
 
   @Override
diff -r 6bad5364a88d -r a4467b9cabb4 src/org/openbravo/retail/posterminal/POSDataSynchronizationErrorHandler.java
--- a/src/org/openbravo/retail/posterminal/POSDataSynchronizationErrorHandler.java	Fri Oct 04 12:04:21 2019 +0530
+++ b/src/org/openbravo/retail/posterminal/POSDataSynchronizationErrorHandler.java	Fri Oct 04 12:04:29 2019 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012 Openbravo S.L.U.
+ * Copyright (C) 2012-2019 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -18,7 +18,6 @@
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.criterion.Restrictions;
-import org.openbravo.base.model.Entity;
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.client.kernel.ComponentProvider.Qualifier;
 import org.openbravo.dal.service.OBCriteria;
@@ -33,7 +32,8 @@
   private static final Logger log = LogManager.getLogger();
 
   @Override
-  public void handleError(Throwable t, Entity entity, JSONObject result, JSONObject jsonRecord) {
+  public void handleError(Throwable t, String typeOfData, JSONObject result,
+      JSONObject jsonRecord) {
 
     OBPOSAppTermStatHist terminalStatusHistory = null;
 
@@ -50,7 +50,7 @@
     }
     String cashupId = null;
     try {
-      if (entity.getName().equals("OBPOS_App_Cashup")) {
+      if (typeOfData.equals("OBPOS_App_Cashup")) {
         if (jsonRecord.has("id")) {
           cashupId = jsonRecord.getString("id");
         }
@@ -111,7 +111,7 @@
     errorEntry.setError(getErrorMessage(t));
     errorEntry.setOrderstatus("N");
     errorEntry.setJsoninfo(jsonRecord.toString());
-    errorEntry.setTypeofdata(entity.getName());
+    errorEntry.setTypeofdata(typeOfData);
     errorEntry
         .setObposApplications(OBDal.getInstance().get(OBPOSApplications.class, posTerminalId));
     OBDal.getInstance().save(errorEntry);
diff -r 6bad5364a88d -r a4467b9cabb4 src/org/openbravo/retail/posterminal/ProcessVoidLayaway.java
--- a/src/org/openbravo/retail/posterminal/ProcessVoidLayaway.java	Fri Oct 04 12:04:21 2019 +0530
+++ b/src/org/openbravo/retail/posterminal/ProcessVoidLayaway.java	Fri Oct 04 12:04:29 2019 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012-2018 Openbravo S.L.U.
+ * Copyright (C) 2012-2019 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -23,6 +23,7 @@
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.mobile.core.process.DataSynchronizationImportProcess;
 import org.openbravo.mobile.core.process.OutDatedDataChangeException;
+import org.openbravo.mobile.core.process.DataSynchronizationProcess.DataSynchronization;
 import org.openbravo.mobile.core.utils.OBMOBCUtils;
 import org.openbravo.model.common.enterprise.DocumentType;
 import org.openbravo.model.common.order.Order;
@@ -30,6 +31,7 @@
 import org.openbravo.service.db.DalConnectionProvider;
 import org.openbravo.service.json.JsonConstants;
 
+@DataSynchronization(entity = "OBPOS_VoidLayaway")
 public class ProcessVoidLayaway extends POSDataSynchronizationProcess
     implements DataSynchronizationImportProcess {
 
diff -r 6bad5364a88d -r a4467b9cabb4 web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js	Fri Oct 04 12:04:21 2019 +0530
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js	Fri Oct 04 12:04:29 2019 +0530
@@ -1142,6 +1142,8 @@
                           data: [
                             {
                               id: auxReceipt.get('id'),
+                              posTerminal: OB.MobileApp.model.get('terminal')
+                                .id,
                               order: auxReceipt
                             }
                           ]

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1570170878 -19800
#      Fri Oct 04 12:04:38 2019 +0530
# Node ID 38ef008af8cb6620bdbe09bdb768422589cd3134
# Parent  d05e5f56c0438a01615545063065f22776fdcb35
Related to issue 41867 : Replaced Entity with typeOfData in DataSynchronizationErrorHandler handleError method

diff -r d05e5f56c043 -r 38ef008af8cb src/org/openbravo/mobile/core/process/DataSynchronizationErrorHandler.java
--- a/src/org/openbravo/mobile/core/process/DataSynchronizationErrorHandler.java	Mon Sep 23 16:29:37 2019 -0400
+++ b/src/org/openbravo/mobile/core/process/DataSynchronizationErrorHandler.java	Fri Oct 04 12:04:38 2019 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012 Openbravo S.L.U.
+ * Copyright (C) 2012-2019 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -12,7 +12,6 @@
 import java.io.StringWriter;
 
 import org.codehaus.jettison.json.JSONObject;
-import org.openbravo.base.model.Entity;
 import org.openbravo.service.db.DbUtility;
 import org.openbravo.service.importprocess.ImportEntry;
 
@@ -36,6 +35,6 @@
     return true;
   }
 
-  public abstract void handleError(Throwable e, Entity entity, JSONObject result,
+  public abstract void handleError(Throwable e, String typeOfData, JSONObject result,
       JSONObject jsonRecord);
 }
diff -r d05e5f56c043 -r 38ef008af8cb src/org/openbravo/mobile/core/process/DataSynchronizationProcess.java
--- a/src/org/openbravo/mobile/core/process/DataSynchronizationProcess.java	Mon Sep 23 16:29:37 2019 -0400
+++ b/src/org/openbravo/mobile/core/process/DataSynchronizationProcess.java	Fri Oct 04 12:04:38 2019 +0530
@@ -248,7 +248,7 @@
           }
 
           // setImportEntryError is called in handleError
-          handleError(t, this.getEntity(), result, jsonRecord);
+          handleError(t, this.getTypeOfData(), result, jsonRecord);
 
           try {
             OBDal.getInstance().getConnection().commit();
@@ -367,7 +367,8 @@
     }
   }
 
-  private void handleError(Throwable t, Entity entity, JSONObject result, JSONObject jsonRecord) {
+  private void handleError(Throwable t, String typeOfData, JSONObject result,
+      JSONObject jsonRecord) {
     DataSynchronizationErrorHandler errorHandler = getErrorHandler();
     if (errorHandler == null) {
       try {
@@ -383,7 +384,7 @@
 
     } else {
       additionalProcessForRecordsSavedInErrorsWindow(jsonRecord);
-      errorHandler.handleError(t, entity, result, jsonRecord);
+      errorHandler.handleError(t, typeOfData, result, jsonRecord);
       if (getImportEntryId() != null) {
         if (errorHandler.setImportEntryStatusToError()) {
           // if error not handled then set error, if error handled then assume
@@ -422,6 +423,13 @@
         .getEntity(this.getClass().getAnnotation(DataSynchronization.class).entity());
   }
 
+  protected String getTypeOfData() {
+    if (this.getClass().getAnnotation(DataSynchronization.class) == null) {
+      return null;
+    }
+    return this.getClass().getAnnotation(DataSynchronization.class).entity();
+  }
+
   public abstract String getAppName();
 
   public abstract JSONObject saveRecord(JSONObject jsonRecord) throws Exception;

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1570171042 -19800
#      Fri Oct 04 12:07:22 2019 +0530
# Node ID 6c07ae62a4af3197458dec3e62d18e4c29d896d4
# Parent  f47ac593b616f1c0e01f17927629f54f06c65910
Related to issue 41867 : Replaced Entity with typeOfData in AWODataSynchronizationErrorHandler

diff -r f47ac593b616 -r 6c07ae62a4af src/org/openbravo/warehouse/advancedwarehouseoperations/mobile/sync/AWODataSynchronizationErrorHandler.java
--- a/src/org/openbravo/warehouse/advancedwarehouseoperations/mobile/sync/AWODataSynchronizationErrorHandler.java	Tue Oct 01 13:01:27 2019 +0200
+++ b/src/org/openbravo/warehouse/advancedwarehouseoperations/mobile/sync/AWODataSynchronizationErrorHandler.java	Fri Oct 04 12:07:22 2019 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2016-2018 Openbravo S.L.U.
+ * Copyright (C) 2016-2019 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -16,7 +16,6 @@
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
-import org.openbravo.base.model.Entity;
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.structure.BaseOBObject;
 import org.openbravo.client.kernel.ComponentProvider.Qualifier;
@@ -40,8 +39,8 @@
   private static final Logger log = Logger.getLogger(AWODataSynchronizationErrorHandler.class);
 
   @Override
-  public void handleError(final Throwable exception, final Entity entity, final JSONObject result,
-      final JSONObject jsonRecord) {
+  public void handleError(final Throwable exception, final String typeOfData,
+      final JSONObject result, final JSONObject jsonRecord) {
     boolean blocksTask = true;
     boolean saveError = true;