diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
index 1b67ca16bd779861f7bbc911e91a929857cdc096..5b29a1ac71d82e9d060bfa840b9a8082f4b26c34 100644
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -120,6 +120,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_PREFERENCE.xml b/src-db/database/sourcedata/AD_PREFERENCE.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c015b3abdea20ef783b9f8ab5f01a554c5e4a790
--- /dev/null
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
index 65accf6d2023c0954c40102f485f82a977520c03..58a184fa7e7b3544cee6ecde6b41f9e43c5f915e 100644
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -1,5 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/retail/copystore/process/TabHandler.java b/src/org/openbravo/retail/copystore/process/TabHandler.java
index d6817ad0c9095a73397900a679c9536ff75b9369..6f01898e94110c17e4d41dcfe278c3b9b8ffbd14 100644
--- a/src/org/openbravo/retail/copystore/process/TabHandler.java
+++ b/src/org/openbravo/retail/copystore/process/TabHandler.java
@@ -24,10 +24,12 @@ import org.openbravo.base.exception.OBException;
import org.openbravo.base.model.Entity;
import org.openbravo.base.model.Property;
import org.openbravo.base.structure.BaseOBObject;
+import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
import org.openbravo.dal.service.OBQuery;
import org.openbravo.erpCommon.businessUtility.Preferences;
import org.openbravo.erpCommon.utility.OBDateUtils;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
import org.openbravo.erpCommon.utility.PropertyException;
import org.openbravo.model.common.enterprise.Organization;
import org.openbravo.retail.copystore.exception.ColumnValidationException;
@@ -52,6 +54,7 @@ public abstract class TabHandler extends PriorityHandler
private static final Logger log = LoggerFactory.getLogger(TabHandler.class);
public static final String DEFAULT_ORGANIZATION = "0";
public static final String TERMINALTYPE = "Terminal type";
+ private static final String ROLLBACKWHENVALIDATEEXCEL = "OBPOSCS_RollbackWhenValidateExcel";
public T origObject;
public T newObject;
protected CopyStoreProcess copyStoreProcess;
@@ -318,14 +321,36 @@ public abstract class TabHandler extends PriorityHandler
isValidRecord = false;
break;
}
- copyStoreProcess.addLog(copyStoreProcess.updatingStore ? LogLevel.INFO : LogLevel.ERROR,
- e.getMessage());
isValidRecord = false;
+
+ if (isPreferenceDoRollbackWhenExcelRecordIsNotValidated()) {
+ copyStoreProcess.addLog(LogLevel.ERROR, e.getMessage());
+ throw new OBException(e.getMessage());
+ } else {
+ copyStoreProcess.addLog(copyStoreProcess.updatingStore ? LogLevel.INFO : LogLevel.ERROR,
+ e.getMessage());
+ }
}
}
return isValidRecord;
}
+ /**
+ * Get preference "Do a rollback when an excel record is not validated" value
+ */
+ private static boolean isPreferenceDoRollbackWhenExcelRecordIsNotValidated() {
+ boolean doRollback = false;
+ try {
+ doRollback = "Y".equals(Preferences.getPreferenceValue(ROLLBACKWHENVALIDATEEXCEL, true,
+ OBContext.getOBContext().getCurrentClient(),
+ OBContext.getOBContext().getCurrentOrganization(), OBContext.getOBContext().getUser(),
+ OBContext.getOBContext().getRole(), null));
+ } catch (PropertyException pe) {
+ throw new OBException(OBMessageUtils.messageBD("REAIN_SendBothAttachmentsNotValid"), pe);
+ }
+ return doRollback;
+ }
+
/**
* Validates a field
*