0036224: Do not do automatic incremental load at login

diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -465,6 +465,18 @@
 <!--F3612469EBC744CF9A40A9E02C99E7A1-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
 <!--F3612469EBC744CF9A40A9E02C99E7A1--></AD_REF_LIST>
 
+<!--F3BA5448C70C4902889A087E6E7B15D9--><AD_REF_LIST>
+<!--F3BA5448C70C4902889A087E6E7B15D9-->  <AD_REF_LIST_ID><![CDATA[F3BA5448C70C4902889A087E6E7B15D9]]></AD_REF_LIST_ID>
+<!--F3BA5448C70C4902889A087E6E7B15D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F3BA5448C70C4902889A087E6E7B15D9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F3BA5448C70C4902889A087E6E7B15D9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F3BA5448C70C4902889A087E6E7B15D9-->  <VALUE><![CDATA[OBMOBC_NotAutoLoadIncrementalAtLogin]]></VALUE>
+<!--F3BA5448C70C4902889A087E6E7B15D9-->  <NAME><![CDATA[No Auto Incremental Load at Login]]></NAME>
+<!--F3BA5448C70C4902889A087E6E7B15D9-->  <DESCRIPTION><![CDATA[Do not do an automatic incremental load at login but let it depend on the increment load time interval]]></DESCRIPTION>
+<!--F3BA5448C70C4902889A087E6E7B15D9-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--F3BA5448C70C4902889A087E6E7B15D9-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--F3BA5448C70C4902889A087E6E7B15D9--></AD_REF_LIST>
+
 <!--F5ACCCCBDE144E00A776368E741593DC--><AD_REF_LIST>
 <!--F5ACCCCBDE144E00A776368E741593DC-->  <AD_REF_LIST_ID><![CDATA[F5ACCCCBDE144E00A776368E741593DC]]></AD_REF_LIST_ID>
 <!--F5ACCCCBDE144E00A776368E741593DC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
--- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
+++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
@@ -1700,7 +1700,13 @@
           //It's time to do a full refresh
           this.loadModels(windowp, false);
         } else {
-          this.loadModels(windowp, true);
+          if (OB.MobileApp.model.hasPermission('OBMOBC_NotAutoLoadIncrementalAtLogin', true)) {
+            if (intervalInc >= 0) {
+              this.loadModels(windowp, true);
+            }
+          } else {
+            this.loadModels(windowp, true);
+          }
         }
       }
 

diff --git a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
@@ -7,7 +7,7 @@
  ************************************************************************************
  */
 
-/*global OB, _, enyo, BigDecimal, localStorage */
+/*global OB, _, enyo, BigDecimal, localStorage, setTimeout */
 
 (function () {
   // initialize the WebPOS terminal model that extends the core terminal model. after this, OB.MobileApp.model will be available
@@ -717,7 +717,9 @@
       var minIncRefresh = this.get('terminal').terminalType.minutestorefreshdatainc * 60 * 1000,
           minTotalRefresh = this.get('terminal').terminalType.minutestorefreshdatatotal * 60 * 1000,
           lastTotalRefresh = OB.UTIL.localStorage.getItem('POSLastTotalRefresh'),
-          lastIncRefresh = OB.UTIL.localStorage.getItem('POSLastIncRefresh');
+          lastIncRefresh = OB.UTIL.localStorage.getItem('POSLastIncRefresh'),
+          now = new Date().getTime(),
+          intervalInc = lastIncRefresh ? (now - lastIncRefresh - minIncRefresh) : 0;
 
       function setTerminalLockTimeout(sessionTimeoutMinutes, sessionTimeoutMilliseconds) {
         OB.debug("Terminal lock timer reset (" + sessionTimeoutMinutes + " minutes)");
@@ -773,7 +775,16 @@
           });
 
         };
-        setInterval(loadModelsIncFunc, minIncRefresh);
+        // in case there was no incremental load at login then schedule an incremental
+        // load at the next expected time, which can be earlier than the standard interval
+        if (intervalInc < 0 && OB.MobileApp.model.hasPermission('OBMOBC_NotAutoLoadIncrementalAtLogin', true)) {
+          setTimeout(function () {
+            loadModelsIncFunc();
+            setInterval(loadModelsIncFunc, minIncRefresh);
+          }, intervalInc * -1);
+        } else {
+          setInterval(loadModelsIncFunc, minIncRefresh);
+        }
       }
 
       var sessionTimeoutMinutes = this.get('terminal').sessionTimeout;
@@ -1292,4 +1303,4 @@
   } else {
     OB.UTIL.HookManager.callbackExecutor(args, callbacks);
   }
-});
\ No newline at end of file
+});