0040219: Simplify check on offline with sync errors or delta age, show delta age in mobile server

diff --git a/src-db/database/model/tables/OBMOBC_SERVER_DEFINITION.xml b/src-db/database/model/tables/OBMOBC_SERVER_DEFINITION.xml --- a/src-db/database/model/tables/OBMOBC_SERVER_DEFINITION.xml +++ b/src-db/database/model/tables/OBMOBC_SERVER_DEFINITION.xml @@ -93,18 +93,10 @@ <default/> <onCreateDefault/> </column> - <column name="OFFLINE_INCOMING_ERRORS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> - <default><![CDATA[N]]></default> - <onCreateDefault/> - </column> <column name="DELTA_AGE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"> <default/> <onCreateDefault/> </column> - <column name="EXPIRED_DELTA_AGE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> - <default><![CDATA[N]]></default> - <onCreateDefault/> - </column> <foreign-key foreignTable="AD_CLIENT" name="OBMOBC_SERV_DEF_AD_CLNT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> @@ -122,6 +114,5 @@ <check name="OBMOBC_SERV_DEF_ALLSER_CHK"><![CDATA[ALLSERVICES IN ('Y', 'N')]]></check> <check name="OBMOBC_SERV_DEF_ISACT_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check> <check name="OBMOBC_SERV_DEF_ISCUR_CHK"><![CDATA[ISCURRENT IN ('Y', 'N')]]></check> - <check name="OBMOBC_SERV_DEF_OFFL_IE_CHK"><![CDATA[OFFLINE_INCOMING_ERRORS IN ('Y', 'N')]]></check> </table> </database> diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -989,45 +989,6 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> -<AD_COLUMN> - <AD_COLUMN_ID><![CDATA[4FFE3405421B4551BE5C663AF9B52457]]></AD_COLUMN_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[Offline_Incoming_Errors]]></NAME> - <DESCRIPTION><![CDATA[Keeps track if there were incoming errors when the server goes offline.]]></DESCRIPTION> - <HELP><![CDATA[Keeps track if there were incoming errors when the server goes offline. Is set to true when the server goes offline and there are incoming errors, is set to false in other cases.]]></HELP> - <COLUMNNAME><![CDATA[Offline_Incoming_Errors]]></COLUMNNAME> - <AD_TABLE_ID><![CDATA[9A030632C0FC4C4AA8A58EC59BE2D116]]></AD_TABLE_ID> - <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> - <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> - <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE> - <ISKEY><![CDATA[N]]></ISKEY> - <ISPARENT><![CDATA[N]]></ISPARENT> - <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> - <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> - <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> - <SEQNO><![CDATA[320]]></SEQNO> - <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> - <AD_ELEMENT_ID><![CDATA[C9BCAD956E664DC3B30BB5E722E7C5B1]]></AD_ELEMENT_ID> - <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> - <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> - <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> - <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> - <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID> - <POSITION><![CDATA[24]]></POSITION> - <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> - <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> - <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> - <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> - <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> - <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> - <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> - <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> -</AD_COLUMN> - <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[51FB2930707C4B7AA7B3943AB6625505]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1370,43 +1331,6 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> -<AD_COLUMN> - <AD_COLUMN_ID><![CDATA[603F88BC1EAB4CB5A2582018C393A680]]></AD_COLUMN_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[Expired_Delta_Age]]></NAME> - <COLUMNNAME><![CDATA[Expired_Delta_Age]]></COLUMNNAME> - <AD_TABLE_ID><![CDATA[9A030632C0FC4C4AA8A58EC59BE2D116]]></AD_TABLE_ID> - <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> - <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> - <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> - <ISKEY><![CDATA[N]]></ISKEY> - <ISPARENT><![CDATA[N]]></ISPARENT> - <ISMANDATORY><![CDATA[N]]></ISMANDATORY> - <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> - <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> - <SEQNO><![CDATA[340]]></SEQNO> - <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> - <AD_ELEMENT_ID><![CDATA[09B5F260704147DFA5A9140708982C52]]></AD_ELEMENT_ID> - <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> - <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> - <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> - <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> - <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID> - <POSITION><![CDATA[34]]></POSITION> - <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> - <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> - <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> - <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> - <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> - <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> - <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> - <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> -</AD_COLUMN> - <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[61333914329F401691F55E1C284DC41B]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -3378,7 +3302,7 @@  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID> - <POSITION><![CDATA[33]]></POSITION> + <POSITION><![CDATA[25]]></POSITION>  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml +++ b/src-db/database/sourcedata/AD_ELEMENT.xml @@ -1,17 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> <data> -<AD_ELEMENT> - <AD_ELEMENT_ID><![CDATA[09B5F260704147DFA5A9140708982C52]]></AD_ELEMENT_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <COLUMNNAME><![CDATA[Expired_Delta_Age]]></COLUMNNAME> - <NAME><![CDATA[Expired Delta Age]]></NAME> - <PRINTNAME><![CDATA[Expired Delta Age]]></PRINTNAME> - <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID> - <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> -</AD_ELEMENT> - <AD_ELEMENT>  <AD_ELEMENT_ID><![CDATA[0B7E54F58AC441C1B7D876005F10620E]]></AD_ELEMENT_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -377,21 +365,6 @@  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> </AD_ELEMENT> -<AD_ELEMENT> - <AD_ELEMENT_ID><![CDATA[C9BCAD956E664DC3B30BB5E722E7C5B1]]></AD_ELEMENT_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <COLUMNNAME><![CDATA[Offline_Incoming_Errors]]></COLUMNNAME> - <NAME><![CDATA[Offline_Incoming_Errors]]></NAME> - <PRINTNAME><![CDATA[Offline_Incoming_Errors]]></PRINTNAME> - <DESCRIPTION><![CDATA[Keeps track if there were incoming errors when the server goes offline.]]></DESCRIPTION> - <HELP><![CDATA[Keeps track if there were incoming errors when the server goes offline. Is set to true when the server goes offline and there are incoming errors, is set to false in other cases.]]></HELP> - <PO_HELP><![CDATA[Keeps track if there were incoming errors when the server goes offline.]]></PO_HELP> - <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID> - <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> -</AD_ELEMENT> - <AD_ELEMENT>  <AD_ELEMENT_ID><![CDATA[F42601E6956F46F49ABF82A55D773C80]]></AD_ELEMENT_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -574,6 +574,32 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> +<AD_FIELD> + <AD_FIELD_ID><![CDATA[550DAF302CCA4073B61307742A726EF8]]></AD_FIELD_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Delta Age]]></NAME> + <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> + <AD_TAB_ID><![CDATA[DDA291351EB54782A20860A6A6E6FDCC]]></AD_TAB_ID> + <AD_COLUMN_ID><![CDATA[FB2FCBC01E4D4346B54B6B0399074F4D]]></AD_COLUMN_ID> + <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> + <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> + <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH> + <ISREADONLY><![CDATA[Y]]></ISREADONLY> + <SEQNO><![CDATA[220]]></SEQNO> + <ISSAMELINE><![CDATA[N]]></ISSAMELINE> + <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> + <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> + <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID> + <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> + <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> + <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> + <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +</AD_FIELD> + <AD_FIELD>  <AD_FIELD_ID><![CDATA[56DB635094A747DE9185CFE77676D675]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>

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 @@  <EXCLUDE_ON_UPDATE><![CDATA[Y]]></EXCLUDE_ON_UPDATE> </STRSYNC_EXCLUDEDCOL> -<STRSYNC_EXCLUDEDCOL> - <STRSYNC_EXCLUDEDCOL_ID><![CDATA[56413565723645258F06F333D9A7FBEA]]></STRSYNC_EXCLUDEDCOL_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <AD_MODULE_ID><![CDATA[C7EC0756A4044DD48BF6BB6A1CDD7734]]></AD_MODULE_ID> - <AD_COLUMN_ID><![CDATA[603F88BC1EAB4CB5A2582018C393A680]]></AD_COLUMN_ID> - <STRSYNC_SYNCHRONIZEDTABLE_ID><![CDATA[E0C5F001E5F14AEDB89967F3C4A88367]]></STRSYNC_SYNCHRONIZEDTABLE_ID> - <EXCLUDE_DIR><![CDATA[Bidirectional]]></EXCLUDE_DIR> - <EXCLUDE_ON_INSERT><![CDATA[Y]]></EXCLUDE_ON_INSERT> - <EXCLUDE_ON_UPDATE><![CDATA[Y]]></EXCLUDE_ON_UPDATE> -</STRSYNC_EXCLUDEDCOL> - <STRSYNC_EXCLUDEDCOL>  <STRSYNC_EXCLUDEDCOL_ID><![CDATA[5922BFE537D94662A3E0DD0D64001401]]></STRSYNC_EXCLUDEDCOL_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> 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<String> list = qry.list();

Notes
(0110196) hgbot (developer) 2019-03-04 15:21	Repository: erp/pmods/org.openbravo.mobile.core Changeset: a9c1492b139dd1580d1ce4cb145f29e62d6d77f4 Author: Martin Taal <martin.taal <at> openbravo.com> Date: Mon Mar 04 15:15:32 2019 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.mobile.core/rev/a9c1492b139dd1580d1ce4cb145f29e62d6d77f4 [^] Related to issue 40219: Simplify check on offline with sync errors or delta age, show delta age in mobile server Remove the two 'flag' columns and add a field to show delta age in mobile server window --- M src-db/database/model/tables/OBMOBC_SERVER_DEFINITION.xml M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_ELEMENT.xml M src-db/database/sourcedata/AD_FIELD.xml ---

(0110200) hgbot (developer) 2019-03-04 15:32	Repository: erp/pmods/org.openbravo.retail.storeserver.synchronization Changeset: 4bee8fab73a2788d5649955574c368628d1a6245 Author: Martin Taal <martin.taal <at> openbravo.com> Date: Mon Mar 04 15:32:26 2019 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.storeserver.synchronization/rev/4bee8fab73a2788d5649955574c368628d1a6245 [^] Fixes issue 40219: Simplify check on offline with sync errors or delta age, show delta age in mobile server Remove the usage of the incoming error and delta-sync-error flag columns in the mobile server definition. --- M src-db/database/sourcedata/STRSYNC_EXCLUDEDCOL.xml M src/org/openbravo/retail/storeserver/synchronization/RetailSynchronizationRequestHandler.java M src/org/openbravo/retail/storeserver/synchronization/StoreServerTransitionToOfflineExternalHandler.java M src/org/openbravo/retail/storeserver/synchronization/eventhandler/MobileServerEventHandler.java ---

(0110356) AugustoMauch (manager) 2019-03-11 17:01	The clean in the js for the management of the INVALID_OFFLINE error is missing

(0110359) hgbot (developer) 2019-03-11 20:56	Repository: erp/pmods/org.openbravo.retail.storeserver.synchronization Changeset: 6852a2e09533deebb29983424bbf458ef01528f2 Author: Martin Taal <martin.taal <at> openbravo.com> Date: Mon Mar 11 20:56:52 2019 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.storeserver.synchronization/rev/6852a2e09533deebb29983424bbf458ef01528f2 [^] Fixes issue 40219: Simplify check on offline with sync errors or delta age, show delta age in mobile server Remove not needed jscript and messages --- M src-db/database/sourcedata/AD_MESSAGE.xml R web/org.openbravo.retail.storeserver.synchronization/js/responseCallbackHandler.js ---

(0110447) AugustoMauch (manager) 2019-03-14 18:07	Code reviewed and verified

Issue History
Date Modified	Username	Field	Change
2019-02-15 12:07	mtaal	New Issue
2019-02-15 12:07	mtaal	Assigned To	=> mtaal
2019-02-15 12:07	mtaal	Triggers an Emergency Pack	=> No
2019-02-18 18:12	mtaal	File Added: 40219-mobile-core.diff
2019-02-18 18:12	mtaal	File Added: 40219-retail-sync.diff
2019-02-18 18:31	mtaal	Review Assigned To	=> AugustoMauch
2019-03-04 15:21	hgbot	Checkin
2019-03-04 15:21	hgbot	Note Added: 0110196
2019-03-04 15:25	mtaal	Relationship added	blocks 0040287
2019-03-04 15:32	hgbot	Checkin
2019-03-04 15:32	hgbot	Note Added: 0110200
2019-03-04 15:32	hgbot	Status	new => resolved
2019-03-04 15:32	hgbot	Resolution	open => fixed
2019-03-04 15:32	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.retail.storeserver.synchronization/rev/4bee8fab73a2788d5649955574c368628d1a6245 [^]
2019-03-11 17:01	AugustoMauch	Note Added: 0110356
2019-03-11 17:01	AugustoMauch	Status	resolved => new
2019-03-11 17:01	AugustoMauch	Resolution	fixed => open
2019-03-11 20:56	hgbot	Checkin
2019-03-11 20:56	hgbot	Note Added: 0110359
2019-03-11 20:56	hgbot	Status	new => resolved
2019-03-11 20:56	hgbot	Resolution	open => fixed
2019-03-11 20:56	hgbot	Fixed in SCM revision	http://code.openbravo.com/erp/pmods/org.openbravo.retail.storeserver.synchronization/rev/4bee8fab73a2788d5649955574c368628d1a6245 [^] => http://code.openbravo.com/erp/pmods/org.openbravo.retail.storeserver.synchronization/rev/6852a2e09533deebb29983424bbf458ef01528f2 [^]
2019-03-14 18:07	AugustoMauch	Note Added: 0110447
2019-03-14 18:07	AugustoMauch	Status	resolved => closed