0038692: SERQA 4142: The payments from ecommerce are not integrated because of the "loaded" property

diff -r 255ac6b87d39 src/org/openbravo/retail/posterminal/ExternalOrderLoader.java
--- a/src/org/openbravo/retail/posterminal/ExternalOrderLoader.java	Fri Jun 01 13:13:57 2018 +0200
+++ b/src/org/openbravo/retail/posterminal/ExternalOrderLoader.java	Mon Jun 04 11:38:12 2018 +0200
@@ -45,6 +45,7 @@
 import org.openbravo.dal.service.OBQuery;
 import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.utility.SequenceIdData;
+import org.openbravo.mobile.core.utils.OBMOBCUtils;
 import org.openbravo.model.ad.access.User;
 import org.openbravo.model.common.businesspartner.BusinessPartner;
 import org.openbravo.model.common.businesspartner.Location;
@@ -510,6 +511,8 @@
     setDefaults(orderJson);
 
     setClientOrg(orderJson);
+    
+    disableConcurrencyCheck(orderJson);
 
     final OBPOSApplications posTerminal = getPOSTerminal(orderJson);
 
@@ -558,6 +561,17 @@
     transformPayments(orderJson);
   }
 
+  private void disableConcurrencyCheck(JSONObject orderJson) throws JSONException{
+
+    if (orderJson.has("id")) {
+      final Order order = OBDal.getInstance().get(Order.class, orderJson.get("id"));
+      if(order!=null) {
+        orderJson.put("loaded", POSUtils.dateFormatUTC.format(OBMOBCUtils
+            .convertToUTC(order.getUpdated())));
+      }
+    }
+  }
+
   // set the special attributes which are needed to cover/handle create, pay and ship
   // separately, this needs to be improved.
   protected void handleOrderSteps(JSONObject orderJson) throws JSONException {