0034641: corrupted receipts are stored in c_order local database

diff --git a/web/org.openbravo.mobile.core/source/data/ob-dal.js b/web/org.openbravo.mobile.core/source/data/ob-dal.js
--- a/web/org.openbravo.mobile.core/source/data/ob-dal.js
+++ b/web/org.openbravo.mobile.core/source/data/ob-dal.js
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012-2015 Openbravo S.L.U.
+ * Copyright (C) 2012-2016 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -665,9 +665,14 @@
     var caller = OB.UTIL.getStackTrace('save', true);
     var callerInfo = getCallerInfo();
     var modelProto = model.constructor.prototype,
-        xhr, rr, data = {};
+        xhr, rr, data = {},
+        jsonColumn;
     forceInsert = forceInsert || false;
-
+    //Validation to avoid wrong saves
+    jsonColumn = _.isUndefined(model.get('json')) ? (_.isUndefined(model.get('objToSend')) ? undefined : 'objToSend') : 'json';
+    if (jsonColumn && (_.isEmpty(model.get(jsonColumn)) || _.isNull(model.get(jsonColumn)))) {
+      OB.error('[OB.Dal.save] Wrong write in ' + model.modelName + ' because json column is undefined.' + ' - Caller: ' + caller + ' - callerInfo: ' + callerInfo + '- Model to save is: ' + JSON.stringify(model.toJSON()));
+    }
     // TODO: properly check model type
     if (modelProto && modelProto.online) {
       if (!model) {
@@ -1128,9 +1133,14 @@
       }
 
       sql = 'DELETE FROM ' + tableName;
-      whereClause = OB.Dal.getWhereClause(criteria, propertyMap);
-      sql = sql + whereClause.sql;
-      params = _.isEmpty(whereClause.params) ? [] : whereClause.params;
+      if (criteria.whereClause) {
+        whereClause = criteria.whereClause;
+        sql = sql + whereClause;
+      } else {
+        whereClause = OB.Dal.getWhereClause(criteria, propertyMap);
+        sql = sql + whereClause.sql;
+        params = _.isEmpty(whereClause.params) ? [] : whereClause.params;
+      }
 
       if (currentTransaction) {
         currentTransaction.executeSql(sql, params, silentFunction(success), processError);
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
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012-2015 Openbravo S.L.U.
+ * Copyright (C) 2012-2016 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -774,11 +774,20 @@
         className = OB.UTIL.processOrderClass;
       }
 
-      var modelIndex = 0;
-      var modelNotFullySynced = false;
-      var newDataToSync = new Backbone.Collection();
+      var mdl, modelIndex = 0,
+          modelNotFullySynced = false,
+          dataCorruption = false,
+          jsonColumn, newDataToSync = new Backbone.Collection();
       while (modelIndex < dataToSync.length) {
-        newDataToSync.add(dataToSync.at(modelIndex));
+        mdl = dataToSync.at(modelIndex);
+        jsonColumn = _.isUndefined(mdl.get('json')) ? (_.isUndefined(mdl.get('objToSend')) ? undefined : 'objToSend') : 'json';
+        if (jsonColumn && (_.isEmpty(mdl.get(jsonColumn)) || _.isNull(mdl.get(jsonColumn)))) {
+          OB.error('[syncModel] Wrong model to Synchronize in backend: ' + mdl.modelName + ' because json column is undefined.');
+          dataCorruption = true;
+        } else {
+          newDataToSync.add(dataToSync.at(modelIndex));
+        }
+
         modelIndex++;
         // partition the data in chunks
         if (modelIndex >= 100 && modelIndex < dataToSync.length) {
@@ -788,6 +797,13 @@
           break;
         }
       }
+      if (dataCorruption) {
+        var modelProto = model.constructor.prototype;
+        var criteria = {
+          whereClause: ' WHERE ' + jsonColumn + ' is null OR ' + jsonColumn + '= "" '
+        };
+        OB.Dal.removeAll(model, criteria);
+      }
 
       var dataToSend = [];
       newDataToSync.each(function (record) {

diff --git a/web/org.openbravo.mobile.core/source/data/ob-dal.js b/web/org.openbravo.mobile.core/source/data/ob-dal.js
--- a/web/org.openbravo.mobile.core/source/data/ob-dal.js
+++ b/web/org.openbravo.mobile.core/source/data/ob-dal.js
@@ -690,6 +690,14 @@
     if (jsonColumn && (_.isEmpty(model.get(jsonColumn)) || _.isNull(model.get(jsonColumn)))) {
       OB.error('[OB.Dal.save] Wrong write in ' + model.modelName + ' because json column is undefined.' + ' - Caller: ' + caller + ' - callerInfo: ' + callerInfo + '- Model to save is: ' + JSON.stringify(model.toJSON()));
     }
+    //The id cannot be null
+    if (_.isNull(model.get('id')) || (model.get('json') && JSON.parse(model.get('json')) && _.isNull(JSON.parse(model.get('json')).id))) {
+      OB.error('[OB.Dal.save] Wrong model, it has no id. ' + ' - Caller: ' + caller + ' - callerInfo: ' + callerInfo + ' Model: ' + JSON.stringify(model.toJSON()) + '\n callerInfo: ' + OB.UTIL.getStackTrace('getCallerInfo', false));
+      var uuid = OB.UTIL.get_UUID();
+      model.set('id', uuid);
+      model.set('json', JSON.stringify(model.serializeToJSON()));
+      forceInsert = true;
+    }
     // TODO: properly check model type
     if (modelProto && modelProto.online) {
       if (!model) {

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -4006,7 +4006,7 @@
         if (OB.UTIL.RfidController.isRfidConfigured()) {
           OB.UTIL.RfidController.eraseEpcOrder(receipt);
         }
-        if (receipt.get('id') && !isPaidQuotation && receipt.get('lines') && receipt.get('lines').length > 0) {
+        if (receipt.get('id') && !isPaidQuotation && receipt.get('lines') && receipt.get('lines').length > 0 && receipt.get('isEditable')) {
           if (OB.MobileApp.model.hasPermission('OBPOS_remove_ticket', true)) {
             receipt.prepareToSend(function () {
               receipt.set('skipApplyPromotions', true);

diff --git a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
--- a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
+++ b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
@@ -62,7 +62,10 @@
             OB.error("The receipt has been closed with an empty 'net' amount in a line (value: " + line.get('net') + ")");
           }
         });
-
+        // 6. verify that client and organization are not null
+        if (OB.UTIL.isNullOrUndefined(this.get('client')) || OB.UTIL.isNullOrUndefined(this.get('organization'))) {
+          OB.error("The receipt has been closed with a wrong client: " + this.get('client') + " or organization: " + this.get('organization'));
+        }
       } catch (e) {
         // do nothing, we do not want to generate another error
       }