[IMP] pos_restaurant: do not pollute global namespace with file loading functions

addons/point_of_sale/static/src/js/main.js

@@ -25,4 +25,3 @@ openerp.point_of_sale = function(openerp) {
     openerp.web.client_actions.add('pos.ui', 'openerp.point_of_sale.Chrome');
 };
 
-    

addons/pos_restaurant/static/src/js/floors.js

@@ -1,4 +1,4 @@
-function openerp_restaurant_floors(instance,module){
+openerp.pos_restaurant.load_floors = function(instance,module){
     var QWeb = instance.web.qweb;
     var _t = instance.web._t;
 
@@ -741,4 +741,5 @@ function openerp_restaurant_floors(instance,module){
             }
         },
     });
-}
+};
+

addons/pos_restaurant/static/src/js/main.js

@@ -1,14 +1,16 @@
-openerp.pos_restaurant = function(instance){
+openerp.pos_restaurant = function(openerp){
 
-    var module = instance.point_of_sale;
+    var module = openerp.point_of_sale;
 
-    openerp_restaurant_notes(instance,module);
+    openerp.pos_restaurant.load_notes(openerp,module);
 
-    openerp_restaurant_splitbill(instance,module);
+    openerp.pos_restaurant.load_splitbill(openerp,module);
 
-    openerp_restaurant_printbill(instance,module);
+    openerp.pos_restaurant.load_printbill(openerp,module);
 
-    openerp_restaurant_floors(instance,module);
+    openerp.pos_restaurant.load_floors(openerp,module);
+
+    openerp.pos_restaurant.load_multiprint(openerp,module);
 
-    openerp_restaurant_multiprint(instance,module);
 };
+

addons/pos_restaurant/static/src/js/multiprint.js

@@ -1,4 +1,4 @@
-function openerp_restaurant_multiprint(instance,module){
+openerp.pos_restaurant.load_multiprint = function(instance,module){
     var QWeb = instance.web.qweb;
 	var _t = instance.web._t;
 
@@ -257,4 +257,5 @@ function openerp_restaurant_multiprint(instance,module){
         },
     });
 
-}
+};
+

addons/pos_restaurant/static/src/js/notes.js

@@ -1,4 +1,4 @@
-function openerp_restaurant_notes(instance,module){
+openerp.pos_restaurant.load_notes = function(instance,module){
     "use strict";
 
     var QWeb = instance.web.qweb;
@@ -64,4 +64,5 @@ function openerp_restaurant_notes(instance,module){
             return this.pos.config.iface_orderline_notes;
         },
     });
-}
+};
+

addons/pos_restaurant/static/src/js/printbill.js

@@ -1,4 +1,4 @@
-function openerp_restaurant_printbill(instance,module){
+openerp.pos_restaurant.load_printbill = function(instance,module){
     var QWeb = instance.web.qweb;
 	var _t = instance.web._t;
 
@@ -23,5 +23,5 @@ function openerp_restaurant_printbill(instance,module){
             return this.pos.config.iface_printbill;
         },
     });
-}
+};
 

addons/pos_restaurant/static/src/js/splitbill.js

@@ -1,4 +1,4 @@
-function openerp_restaurant_splitbill(instance, module){
+openerp.pos_restaurant.load_splitbill = function(instance, module){
     var QWeb = instance.web.qweb;
 
     module.SplitbillScreenWidget = module.ScreenWidget.extend({
@@ -179,4 +179,5 @@ function openerp_restaurant_splitbill(instance, module){
             return this.pos.config.iface_splitbill;
         },
     });
-}
+};
+

addons/pos_restaurant/views/templates.xml

@@ -13,12 +13,12 @@
         <template id="assets_frontend" inherit_id="web.assets_common">
           <xpath expr="." position="inside">
               <script type="text/javascript" src="/pos_restaurant/static/lib/js/jquery.event.drag-2.2.js"></script>
+              <script type="text/javascript" src="/pos_restaurant/static/src/js/main.js"></script>
               <script type="text/javascript" src="/pos_restaurant/static/src/js/multiprint.js"></script>
               <script type="text/javascript" src="/pos_restaurant/static/src/js/splitbill.js"></script>
               <script type="text/javascript" src="/pos_restaurant/static/src/js/printbill.js"></script>
               <script type="text/javascript" src="/pos_restaurant/static/src/js/floors.js"></script>
               <script type="text/javascript" src="/pos_restaurant/static/src/js/notes.js"></script>
-              <script type="text/javascript" src="/pos_restaurant/static/src/js/main.js"></script>
           </xpath>
         </template>