8 files changed, 24 insertions, 19 deletions
diff --git a/addons/point_of_sale/static/src/js/main.js b/addons/point_of_sale/static/src/js/main.js
index 3b3064fa957..10e087c446d 100644
--- a/addons/point_of_sale/static/src/js/main.js
+++ b/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');
 };
 
-    
diff --git a/addons/pos_restaurant/static/src/js/floors.js b/addons/pos_restaurant/static/src/js/floors.js
index d6d694578a9..8a43c91f00f 100644
--- a/addons/pos_restaurant/static/src/js/floors.js
+++ b/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){
             }
         },
     });
-}
+};
+
diff --git a/addons/pos_restaurant/static/src/js/main.js b/addons/pos_restaurant/static/src/js/main.js
index 4f7d52cc170..edb899588d3 100644
--- a/addons/pos_restaurant/static/src/js/main.js
+++ b/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);
 };
+
diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js
index 0ca4695768b..61b8c1663a4 100644
--- a/addons/pos_restaurant/static/src/js/multiprint.js
+++ b/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){
         },
     });
 
-}
+};
+
diff --git a/addons/pos_restaurant/static/src/js/notes.js b/addons/pos_restaurant/static/src/js/notes.js
index ef33552b8ee..2d60b66d62b 100644
--- a/addons/pos_restaurant/static/src/js/notes.js
+++ b/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;
         },
     });
-}
+};
+
diff --git a/addons/pos_restaurant/static/src/js/printbill.js b/addons/pos_restaurant/static/src/js/printbill.js
index 3ea879e5b92..898dfdc21c2 100644
--- a/addons/pos_restaurant/static/src/js/printbill.js
+++ b/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;
         },
     });
-}
+};
 
diff --git a/addons/pos_restaurant/static/src/js/splitbill.js b/addons/pos_restaurant/static/src/js/splitbill.js
index 06d03705d5f..70714418430 100644
--- a/addons/pos_restaurant/static/src/js/splitbill.js
+++ b/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;
         },
     });
-}
+};
+
diff --git a/addons/pos_restaurant/views/templates.xml b/addons/pos_restaurant/views/templates.xml
index 5a91bbe1f76..86fd0dac54c 100644
--- a/addons/pos_restaurant/views/templates.xml
+++ b/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>