0034287: Entity vs Import Qualifier

diff -r 941f54b84186 src/org/openbravo/retail/posterminal/CancelLayawayLoader.java
--- a/src/org/openbravo/retail/posterminal/CancelLayawayLoader.java	Thu Oct 20 10:17:04 2016 +0200
+++ b/src/org/openbravo/retail/posterminal/CancelLayawayLoader.java	Thu Oct 20 19:23:12 2016 +0200
@@ -21,14 +21,15 @@
 import org.openbravo.model.common.order.Order;
 import org.openbravo.service.json.JsonConstants;
 
-@DataSynchronization(entity = "OBPOS_CancelLayaway")
+@DataSynchronization(entity = "Order")
 public class CancelLayawayLoader extends POSDataSynchronizationProcess implements
     DataSynchronizationImportProcess {
 
   private static final Logger log = Logger.getLogger(CancelLayawayLoader.class);
 
   public JSONObject saveRecord(JSONObject json) throws Exception {
-
+    // if (true)
+    // throw new OBException("Prueba");
     boolean useOrderDocumentNoForRelatedDocs = false;
 
     try {
@@ -60,4 +61,14 @@
   protected String getImportQualifier() {
     return "OBPOS_CancelLayaway";
   }
+
+  @Override
+  protected boolean additionalCheckForDuplicates(JSONObject record) {
+    try {
+      return OBDal.getInstance().get(Order.class, record.get("id")).getCancelledorder() != null;
+    } catch (Exception e) {
+      log.error("CancelLayawayOrder failed when doing additionalCheckForDuplicates", e);
+      return false;
+    }
+  }
 }
diff -r 941f54b84186 src/org/openbravo/retail/posterminal/ExternalOrderLoaderErrorHandler.java
--- a/src/org/openbravo/retail/posterminal/ExternalOrderLoaderErrorHandler.java	Thu Oct 20 10:17:04 2016 +0200
+++ b/src/org/openbravo/retail/posterminal/ExternalOrderLoaderErrorHandler.java	Thu Oct 20 19:23:12 2016 +0200
@@ -12,7 +12,6 @@
 
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.exception.OBException;
-import org.openbravo.base.model.Entity;
 import org.openbravo.client.kernel.ComponentProvider.Qualifier;
 import org.openbravo.service.db.DbUtility;
 
@@ -23,7 +22,8 @@
 public class ExternalOrderLoaderErrorHandler extends POSDataSynchronizationErrorHandler {
 
   @Override
-  public void handleError(Throwable t, Entity entity, JSONObject result, JSONObject jsonRecord) {
+  public void handleError(Throwable t, String importQualifier, JSONObject result,
+      JSONObject jsonRecord) {
     if (ExternalOrderLoader.isSynchronizedRequest()) {
       Throwable localT = t;
       if (localT instanceof OBException && localT.getCause() != null) {
@@ -35,7 +35,7 @@
       }
       throw new OBException(ExternalOrderLoader.getCurrentException());
     }
-    super.handleError(t, entity, result, jsonRecord);
+    super.handleError(t, importQualifier, result, jsonRecord);
   }
 
   public boolean setImportEntryStatusToError() {
diff -r 941f54b84186 src/org/openbravo/retail/posterminal/POSDataSynchronizationErrorHandler.java
--- a/src/org/openbravo/retail/posterminal/POSDataSynchronizationErrorHandler.java	Thu Oct 20 10:17:04 2016 +0200
+++ b/src/org/openbravo/retail/posterminal/POSDataSynchronizationErrorHandler.java	Thu Oct 20 19:23:12 2016 +0200
@@ -13,7 +13,6 @@
 import org.apache.log4j.Logger;
 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.client.kernel.ComponentProvider.Qualifier;
 import org.openbravo.dal.service.OBDal;
@@ -27,7 +26,8 @@
   private static final Logger log = Logger.getLogger(DataSynchronizationProcess.class);
 
   @Override
-  public void handleError(Throwable t, Entity entity, JSONObject result, JSONObject jsonRecord) {
+  public void handleError(Throwable t, String importQualifier, JSONObject result,
+      JSONObject jsonRecord) {
 
     // Creation of the order failed. We will now store the order in the import errors table
     String posTerminalId = null;
@@ -57,7 +57,7 @@
     errorEntry.setError(getErrorMessage(t));
     errorEntry.setOrderstatus("N");
     errorEntry.setJsoninfo(jsonRecord.toString());
-    errorEntry.setTypeofdata(entity.getName());
+    errorEntry.setTypeofdata(importQualifier);
     errorEntry
         .setObposApplications(OBDal.getInstance().get(OBPOSApplications.class, posTerminalId));
     OBDal.getInstance().save(errorEntry);

diff -r c54428c8f982 src/org/openbravo/mobile/core/process/DataSynchronizationErrorHandler.java
--- a/src/org/openbravo/mobile/core/process/DataSynchronizationErrorHandler.java	Tue Oct 18 08:49:36 2016 +0200
+++ b/src/org/openbravo/mobile/core/process/DataSynchronizationErrorHandler.java	Thu Oct 20 19:23:36 2016 +0200
@@ -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 importQualifier, JSONObject result,
       JSONObject jsonRecord);
 }
diff -r c54428c8f982 src/org/openbravo/mobile/core/process/DataSynchronizationProcess.java
--- a/src/org/openbravo/mobile/core/process/DataSynchronizationProcess.java	Tue Oct 18 08:49:36 2016 +0200
+++ b/src/org/openbravo/mobile/core/process/DataSynchronizationProcess.java	Thu Oct 20 19:23:36 2016 +0200
@@ -244,7 +244,7 @@
             setImportEntryProcessed();
           } else {
             // setImportEntryError is called in handleError
-            handleError(t, this.getEntity(), result, jsonRecord);
+            handleError(t, this.getImportQualifier(), result, jsonRecord);
           }
 
           try {
@@ -326,7 +326,8 @@
     importEntryManager.setImportEntryError(getImportEntryId(), t);
   }
 
-  private void handleError(Throwable t, Entity entity, JSONObject result, JSONObject jsonRecord) {
+  private void handleError(Throwable t, String importQualifier, JSONObject result,
+      JSONObject jsonRecord) {
     DataSynchronizationErrorHandler errorHandler = getErrorHandler();
     if (errorHandler == null) {
       try {
@@ -343,7 +344,7 @@
 
     } else {
       additionalProcessForRecordsSavedInErrorsWindow(jsonRecord);
-      errorHandler.handleError(t, entity, result, jsonRecord);
+      errorHandler.handleError(t, importQualifier, result, jsonRecord);
       if (getImportEntryId() != null) {
         if (errorHandler.setImportEntryStatusToError()) {
           // if error not handled then set error, if error handled then assume