0036888: [SCO][Contribution] newOrder function should be static to allow to reuse it from outside the model

# HG changeset patch
# User Guillermo Alvarez de Eulate <guillermo.alvarez@openbravo.com>
# Date 1500293593 -7200
# Node ID b2bbb52b7fa64ee96ff8308efd959f8aff53010e
# Parent  57d9b039b05973d2c55d261800073125f05f35d6
[SCO] newOrder function is now an static method

- This method can be used from external points
- Changed the way to reset values for "additional proprties"

diff -r 57d9b039b059 -r b2bbb52b7fa6 web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js	Fri Sep 08 18:51:41 2017 +0530
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js	Mon Jul 17 14:13:13 2017 +0200
@@ -4669,95 +4669,26 @@
     },
 
     newOrder: function (bp) {
-      var order = new Order(),
-          receiptProperties, i, p;
-      bp = bp ? bp : OB.MobileApp.model.get('businessPartner');
-
+      var i, p, receiptProperties, propertiesToReset = [];
       // reset in new order properties defined in Receipt Properties dialog
       if (OB.MobileApp.view.$.containerWindow && OB.MobileApp.view.$.containerWindow.getRoot() && OB.MobileApp.view.$.containerWindow.getRoot().$.receiptPropertiesDialog) {
         receiptProperties = OB.MobileApp.view.$.containerWindow.getRoot().$.receiptPropertiesDialog.newAttributes;
         for (i = 0; i < receiptProperties.length; i++) {
           if (receiptProperties[i].modelProperty) {
-            order.set(receiptProperties[i].modelProperty, '');
+            propertiesToReset.push({
+              'propertyName': receiptProperties[i].modelProperty
+            });
           }
           if (receiptProperties[i].extraProperties) {
             for (p = 0; p < receiptProperties[i].extraProperties.length; p++) {
-              order.set(receiptProperties[i].extraProperties[p], '');
+              propertiesToReset.push({
+                'propertyName': receiptProperties[i].extraProperties[p]
+              });
             }
           }
         }
       }
-
-      order.set('client', OB.MobileApp.model.get('terminal').client);
-      order.set('organization', OB.MobileApp.model.get('terminal').organization);
-      order.set('createdBy', OB.MobileApp.model.get('orgUserId'));
-      order.set('updatedBy', OB.MobileApp.model.get('orgUserId'));
-      order.set('documentType', OB.MobileApp.model.get('terminal').terminalType.documentType);
-      order.set('orderType', OB.MobileApp.model.get('terminal').terminalType.layawayorder ? 2 : 0); // 0: Sales order, 1: Return order, 2: Layaway, 3: Void Layaway
-      order.set('generateInvoice', false);
-      order.set('isQuotation', false);
-      order.set('oldId', null);
-      order.set('session', OB.MobileApp.model.get('session'));
-      order.set('bp', bp);
-      if (OB.MobileApp.model.hasPermission('EnableMultiPriceList', true)) {
-        // Set price list for order
-        order.set('priceList', bp.get('priceList'));
-        var priceIncludesTax = bp.get('priceIncludesTax');
-        if (OB.UTIL.isNullOrUndefined(priceIncludesTax)) {
-          priceIncludesTax = OB.MobileApp.model.get('pricelist').priceIncludesTax;
-        }
-        order.set('priceIncludesTax', priceIncludesTax);
-      } else {
-        order.set('priceList', OB.MobileApp.model.get('terminal').priceList);
-        order.set('priceIncludesTax', OB.MobileApp.model.get('pricelist').priceIncludesTax);
-      }
-      if (OB.MobileApp.model.hasPermission('OBPOS_receipt.invoice')) {
-        if (OB.MobileApp.model.hasPermission('OBPOS_retail.restricttaxidinvoice', true) && !bp.get('taxID')) {
-          if (OB.MobileApp.model.get('terminal').terminalType.generateInvoice) {
-            OB.UTIL.showError(OB.I18N.getLabel('OBPOS_BP_No_Taxid'));
-          } else {
-            OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_BP_No_Taxid'));
-          }
-          order.set('generateInvoice', false);
-        } else {
-          order.set('generateInvoice', OB.MobileApp.model.get('terminal').terminalType.generateInvoice);
-        }
-      } else {
-        order.set('generateInvoice', false);
-      }
-      order.set('currency', OB.MobileApp.model.get('terminal').currency);
-      order.set('currency' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER, OB.MobileApp.model.get('terminal')['currency' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER]);
-      order.set('warehouse', OB.MobileApp.model.get('terminal').warehouse);
-      if (OB.MobileApp.model.get('context').user.isSalesRepresentative) {
-        order.set('salesRepresentative', OB.MobileApp.model.get('context').user.id);
-        order.set('salesRepresentative' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER, OB.MobileApp.model.get('context').user._identifier);
-      } else {
-        order.set('salesRepresentative', null);
-        order.set('salesRepresentative' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER, null);
-      }
-      order.set('posTerminal', OB.MobileApp.model.get('terminal').id);
-      order.set('posTerminal' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER, OB.MobileApp.model.get('terminal')._identifier);
-      order.set('orderDate', OB.I18N.normalizeDate(new Date()));
-      order.set('creationDate', null);
-      order.set('isPaid', false);
-      order.set('creditAmount', OB.DEC.Zero);
-      order.set('paidPartiallyOnCredit', false);
-      order.set('paidOnCredit', false);
-      order.set('isLayaway', false);
-      order.set('isPartiallyDelivered', false);
-      order.set('taxes', {});
-
-      var nextDocumentno = OB.MobileApp.model.getNextDocumentno();
-      order.set('documentnoPrefix', OB.MobileApp.model.get('terminal').docNoPrefix);
-      order.set('documentnoSuffix', nextDocumentno.documentnoSuffix);
-      order.set('documentNo', nextDocumentno.documentNo);
-      order.set('print', true);
-      order.set('sendEmail', false);
-      order.set('openDrawer', false);
-      OB.UTIL.HookManager.executeHooks('OBPOS_NewReceipt', {
-        newOrder: order
-      });
-      return order;
+      return OB.Collection.OrderList.newOrder(bp, propertiesToReset);
     },
 
     newPaidReceipt: function (model, callback) {
@@ -5467,6 +5398,89 @@
         }
       });
     }
+  }, {
+    newOrder: function (bp, propertiesToReset) {
+      var order = new Order(),
+          i;
+      bp = bp ? bp : OB.MobileApp.model.get('businessPartner');
+
+      if (propertiesToReset && _.isArray(propertiesToReset)) {
+        for (i = 0; i < propertiesToReset.length; i++) {
+          order.set(propertiesToReset[i].propertyName, '');
+        }
+      }
+
+      order.set('client', OB.MobileApp.model.get('terminal').client);
+      order.set('organization', OB.MobileApp.model.get('terminal').organization);
+      order.set('createdBy', OB.MobileApp.model.get('orgUserId'));
+      order.set('updatedBy', OB.MobileApp.model.get('orgUserId'));
+      order.set('documentType', OB.MobileApp.model.get('terminal').terminalType.documentType);
+      order.set('orderType', OB.MobileApp.model.get('terminal').terminalType.layawayorder ? 2 : 0); // 0: Sales order, 1: Return order, 2: Layaway, 3: Void Layaway
+      order.set('generateInvoice', false);
+      order.set('isQuotation', false);
+      order.set('oldId', null);
+      order.set('session', OB.MobileApp.model.get('session'));
+      order.set('bp', bp);
+      if (OB.MobileApp.model.hasPermission('EnableMultiPriceList', true)) {
+        // Set price list for order
+        order.set('priceList', bp.get('priceList'));
+        var priceIncludesTax = bp.get('priceIncludesTax');
+        if (OB.UTIL.isNullOrUndefined(priceIncludesTax)) {
+          priceIncludesTax = OB.MobileApp.model.get('pricelist').priceIncludesTax;
+        }
+        order.set('priceIncludesTax', priceIncludesTax);
+      } else {
+        order.set('priceList', OB.MobileApp.model.get('terminal').priceList);
+        order.set('priceIncludesTax', OB.MobileApp.model.get('pricelist').priceIncludesTax);
+      }
+      if (OB.MobileApp.model.hasPermission('OBPOS_receipt.invoice')) {
+        if (OB.MobileApp.model.hasPermission('OBPOS_retail.restricttaxidinvoice', true) && !bp.get('taxID')) {
+          if (OB.MobileApp.model.get('terminal').terminalType.generateInvoice) {
+            OB.UTIL.showError(OB.I18N.getLabel('OBPOS_BP_No_Taxid'));
+          } else {
+            OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_BP_No_Taxid'));
+          }
+          order.set('generateInvoice', false);
+        } else {
+          order.set('generateInvoice', OB.MobileApp.model.get('terminal').terminalType.generateInvoice);
+        }
+      } else {
+        order.set('generateInvoice', false);
+      }
+      order.set('currency', OB.MobileApp.model.get('terminal').currency);
+      order.set('currency' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER, OB.MobileApp.model.get('terminal')['currency' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER]);
+      order.set('warehouse', OB.MobileApp.model.get('terminal').warehouse);
+      if (OB.MobileApp.model.get('context').user.isSalesRepresentative) {
+        order.set('salesRepresentative', OB.MobileApp.model.get('context').user.id);
+        order.set('salesRepresentative' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER, OB.MobileApp.model.get('context').user._identifier);
+      } else {
+        order.set('salesRepresentative', null);
+        order.set('salesRepresentative' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER, null);
+      }
+      order.set('posTerminal', OB.MobileApp.model.get('terminal').id);
+      order.set('posTerminal' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER, OB.MobileApp.model.get('terminal')._identifier);
+      order.set('orderDate', OB.I18N.normalizeDate(new Date()));
+      order.set('creationDate', null);
+      order.set('isPaid', false);
+      order.set('creditAmount', OB.DEC.Zero);
+      order.set('paidPartiallyOnCredit', false);
+      order.set('paidOnCredit', false);
+      order.set('isLayaway', false);
+      order.set('isPartiallyDelivered', false);
+      order.set('taxes', {});
+
+      var nextDocumentno = OB.MobileApp.model.getNextDocumentno();
+      order.set('documentnoPrefix', OB.MobileApp.model.get('terminal').docNoPrefix);
+      order.set('documentnoSuffix', nextDocumentno.documentnoSuffix);
+      order.set('documentNo', nextDocumentno.documentNo);
+      order.set('print', true);
+      order.set('sendEmail', false);
+      order.set('openDrawer', false);
+      OB.UTIL.HookManager.executeHooks('OBPOS_NewReceipt', {
+        newOrder: order
+      });
+      return order;
+    }
   });
 
   var MultiOrders = Backbone.Model.extend({