diff --git a/src-db/database/sourcedata/STRSYNC_EXCLUDEDCOL.xml b/src-db/database/sourcedata/STRSYNC_EXCLUDEDCOL.xml
--- a/src-db/database/sourcedata/STRSYNC_EXCLUDEDCOL.xml
+++ b/src-db/database/sourcedata/STRSYNC_EXCLUDEDCOL.xml
@@ -520,19 +520,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/org/openbravo/retail/storeserver/synchronization/RetailSynchronizationRequestHandler.java b/src/org/openbravo/retail/storeserver/synchronization/RetailSynchronizationRequestHandler.java
--- a/src/org/openbravo/retail/storeserver/synchronization/RetailSynchronizationRequestHandler.java
+++ b/src/org/openbravo/retail/storeserver/synchronization/RetailSynchronizationRequestHandler.java
@@ -124,23 +124,6 @@
// handle invalid offline here, two cases
final boolean isOffline = thisServerDefinition.getStatus().equals(
MobileServerState.OFFLINE.getValue());
- // sync errors when going offline and still sync errors
- if (isOffline && MobileServerController.getInstance().isThisAStoreServer()
- && thisServerDefinition.isOfflineIncomingErrors()
- && ReplicationUtils.doIncomingSyncErrorsExist()) {
- // send back invalid offline status
- log.warn("Sending back invalid offline as incoming errors exist");
- writeResponseJSON(response, "INVALID_OFFLINE");
- return false;
- }
- // delta which is too old when going offline and still is too old
- if (isOffline && MobileServerController.getInstance().isThisAStoreServer()
- && thisServerDefinition.isExpiredDeltaAge() && MobileServerUtils.isDeltaAgeExpired()) {
- // send back invalid offline status
- log.warn("Sending back invalid offline as delta age expired");
- writeResponseJSON(response, "INVALID_OFFLINE");
- return false;
- }
// only forward to CS if online
final boolean isOnline = thisServerDefinition.getStatus().equals(
MobileServerState.ONLINE.getValue());
diff --git a/src/org/openbravo/retail/storeserver/synchronization/StoreServerTransitionToOfflineExternalHandler.java b/src/org/openbravo/retail/storeserver/synchronization/StoreServerTransitionToOfflineExternalHandler.java
--- a/src/org/openbravo/retail/storeserver/synchronization/StoreServerTransitionToOfflineExternalHandler.java
+++ b/src/org/openbravo/retail/storeserver/synchronization/StoreServerTransitionToOfflineExternalHandler.java
@@ -38,22 +38,20 @@
@Override
public boolean allowTransitionToOffline() {
- final boolean allow = !ReplicationUtils.doIncomingSyncErrorsExist()
- && StoreServerVersionHandler.getInstance().areCentralStoreServerVersionsCompatible()
- && !MobileServerUtils.isDeltaAgeExpired();
- if (!allow) {
- if (MobileServerUtils.isDeltaAgeExpired()) {
- log.info("Delta age is too old, can not go to offline");
- }
- if (ReplicationUtils.doIncomingSyncErrorsExist()) {
- log.info("Can not transition to offline because there are incoming sync errors");
- }
- if (!StoreServerVersionHandler.getInstance().areCentralStoreServerVersionsCompatible()) {
- log.info("Can not transition to offline because there are version differences");
- }
+ if (MobileServerUtils.isDeltaAgeExpired()) {
+ log.info("Delta age is too old, can not go to offline");
+ return false;
+ }
+ if (ReplicationUtils.doIncomingSyncErrorsExist()) {
+ log.info("Can not transition to offline because there are incoming sync errors");
+ return false;
+ }
+ if (!StoreServerVersionHandler.getInstance().areCentralStoreServerVersionsCompatible()) {
+ log.info("Can not transition to offline because there are version differences");
+ return false;
}
- return allow;
+ return true;
}
}
diff --git a/src/org/openbravo/retail/storeserver/synchronization/eventhandler/MobileServerEventHandler.java b/src/org/openbravo/retail/storeserver/synchronization/eventhandler/MobileServerEventHandler.java
--- a/src/org/openbravo/retail/storeserver/synchronization/eventhandler/MobileServerEventHandler.java
+++ b/src/org/openbravo/retail/storeserver/synchronization/eventhandler/MobileServerEventHandler.java
@@ -32,9 +32,7 @@
import org.openbravo.client.kernel.event.EntityUpdateEvent;
import org.openbravo.erpCommon.utility.OBMessageUtils;
import org.openbravo.mobile.core.MobileServerDefinition;
-import org.openbravo.mobile.core.servercontroller.MobileServerState;
import org.openbravo.mobile.core.servercontroller.MobileServerUtils;
-import org.openbravo.replication.symmetricds.util.ReplicationUtils;
/**
* Listens events done on for the {@link MobileServerDefinition} entity. Checks the reload status.
@@ -49,15 +47,6 @@
private static Property TYPE_PROPERTY = ModelProvider.getInstance()
.getEntity(MobileServerDefinition.ENTITY_NAME)
.getProperty(MobileServerDefinition.PROPERTY_SERVERTYPE);
- private static Property OFFLINE_ERROR_PROPERTY = ModelProvider.getInstance()
- .getEntity(MobileServerDefinition.ENTITY_NAME)
- .getProperty(MobileServerDefinition.PROPERTY_OFFLINEINCOMINGERRORS);
- private static Property EXPIRED_DELTA_AGE_PROPERTY = ModelProvider.getInstance()
- .getEntity(MobileServerDefinition.ENTITY_NAME)
- .getProperty(MobileServerDefinition.PROPERTY_EXPIREDDELTAAGE);
- private static Property STATUS_PROPERTY = ModelProvider.getInstance()
- .getEntity(MobileServerDefinition.ENTITY_NAME)
- .getProperty(MobileServerDefinition.PROPERTY_STATUS);
@Override
protected Entity[] getObservedEntities() {
@@ -76,7 +65,6 @@
return;
}
checkReloadStatus(event);
- updateOfflineIncomingErrorsFlag(event);
}
private void checkReloadStatus(EntityPersistenceEvent event) {
@@ -88,21 +76,4 @@
}
}
}
-
- private void updateOfflineIncomingErrorsFlag(EntityUpdateEvent event) {
- final String currentState = (String) event.getCurrentState(STATUS_PROPERTY);
- final String previousState = (String) event.getPreviousState(STATUS_PROPERTY);
-
- final boolean currentStateOffline = MobileServerState.OFFLINE.getValue().equals(currentState);
- final boolean previousStateOffline = MobileServerState.OFFLINE.getValue().equals(previousState);
- final boolean currentStateOnline = MobileServerState.ONLINE.getValue().equals(currentState);
- final Boolean offlineError = (Boolean) event.getCurrentState(OFFLINE_ERROR_PROPERTY);
- if (currentStateOffline && !previousStateOffline) {
- event.setCurrentState(OFFLINE_ERROR_PROPERTY, ReplicationUtils.doIncomingSyncErrorsExist());
- event.setCurrentState(EXPIRED_DELTA_AGE_PROPERTY, MobileServerUtils.isDeltaAgeExpired());
- } else if (currentStateOnline && offlineError != null && offlineError) {
- event.setCurrentState(OFFLINE_ERROR_PROPERTY, false);
- event.setCurrentState(EXPIRED_DELTA_AGE_PROPERTY, false);
- }
- }
}
diff --git a/src/org/openbravo/retail/storeserver/synchronization/router/AssortmentRouter.java b/src/org/openbravo/retail/storeserver/synchronization/router/AssortmentRouter.java
--- a/src/org/openbravo/retail/storeserver/synchronization/router/AssortmentRouter.java
+++ b/src/org/openbravo/retail/storeserver/synchronization/router/AssortmentRouter.java
@@ -65,7 +65,7 @@
.getSession()
.createQuery(
"select id from " + Organization.ENTITY_NAME + " where "
- + Organization.PROPERTY_OBRETCOPRODUCTLIST + "=:assortmentId", String.class);
+ + Organization.PROPERTY_OBRETCOPRODUCTLIST + ".id=:assortmentId", String.class);
qry.setParameter("assortmentId", assortmentId);
final List list = qry.list();