[IMP] point_of_sale: put the POS js files include function into the openerp namespace

diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index 8447362..60d09b7 100644 (file)
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -1,4 +1,4 @@
-function openerp_pos_db(instance, module){ 
+openerp.point_of_sale.load_db = function load_db(instance, module){ 
     "use strict";
 
     /* The PosDB holds reference to data that is either

diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index 1b42026..cc44f6f 100644 (file)
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -1,5 +1,4 @@
-
-function openerp_pos_devices(instance,module){ //module is instance.point_of_sale
+openerp.point_of_sale.load_devices = function load_devices(instance,module){ //module is instance.point_of_sale
     "use strict";
 
        var _t = instance.web._t;

diff --git a/addons/point_of_sale/static/src/js/main.js b/addons/point_of_sale/static/src/js/main.js
index 835398a..fd0e9bd 100644 (file)
--- a/addons/point_of_sale/static/src/js/main.js
+++ b/addons/point_of_sale/static/src/js/main.js
@@ -1,26 +1,24 @@
 
-openerp.point_of_sale = function(instance) {
+openerp.point_of_sale = function(openerp) {
     "use strict";
 
-    instance.point_of_sale = {};
+    var module = openerp.point_of_sale;
 
-    var module = instance.point_of_sale;
+    openerp.point_of_sale.load_db(openerp,module);         // import db.js
 
-    openerp_pos_db(instance,module);         // import db.js
+    openerp.point_of_sale.load_models(openerp,module);     // import pos_models.js
 
-    openerp_pos_models(instance,module);     // import pos_models.js
+    openerp.point_of_sale.load_basewidget(openerp,module); // import pos_basewidget.js
 
-    openerp_pos_basewidget(instance,module); // import pos_basewidget.js
+    openerp.point_of_sale.load_keyboard(openerp,module);   // import  pos_keyboard_widget.js
 
-    openerp_pos_keyboard(instance,module);   // import  pos_keyboard_widget.js
+    openerp.point_of_sale.load_screens(openerp,module);    // import pos_screens.js
 
-    openerp_pos_screens(instance,module);    // import pos_screens.js
+    openerp.point_of_sale.load_devices(openerp,module);    // import pos_devices.js
 
-    openerp_pos_devices(instance,module);    // import pos_devices.js
-    
-    openerp_pos_widgets(instance,module);    // import pos_widgets.js
+    openerp.point_of_sale.load_widgets(openerp,module);    // import pos_widgets.js
 
-    instance.web.client_actions.add('pos.ui', 'instance.point_of_sale.PosWidget');
+    openerp.web.client_actions.add('pos.ui', 'openerp.point_of_sale.PosWidget');
 };
 
     

diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 98ebbb2..7c02103 100644 (file)
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1,4 +1,4 @@
-function openerp_pos_models(instance, module){ //module is instance.point_of_sale
+openerp.point_of_sale.load_models = function load_models(instance, module){ //module is instance.point_of_sale
     "use strict";
 
     var QWeb = instance.web.qweb;

diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index b40bb62..2ec6288 100644 (file)
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -15,7 +15,7 @@
 // that only one screen is shown at the same time and that show() is called after all
 // hide()s
 
-function openerp_pos_screens(instance, module){ //module is instance.point_of_sale
+openerp.point_of_sale.load_screens = function load_screens(instance, module){ //module is instance.point_of_sale
     "use strict";
 
     var QWeb = instance.web.qweb,

diff --git a/addons/point_of_sale/static/src/js/widget_base.js b/addons/point_of_sale/static/src/js/widget_base.js
index a1faf8c..9f44eff 100644 (file)
--- a/addons/point_of_sale/static/src/js/widget_base.js
+++ b/addons/point_of_sale/static/src/js/widget_base.js
@@ -1,4 +1,4 @@
-function openerp_pos_basewidget(instance, module){ //module is instance.point_of_sale
+openerp.point_of_sale.load_basewidget = function load_basewidget(instance, module){ //module is instance.point_of_sale
     "use strict";
 
     var round_di = instance.web.round_decimals;

diff --git a/addons/point_of_sale/static/src/js/widget_keyboard.js b/addons/point_of_sale/static/src/js/widget_keyboard.js
index fe1a366..2abc5af 100644 (file)
--- a/addons/point_of_sale/static/src/js/widget_keyboard.js
+++ b/addons/point_of_sale/static/src/js/widget_keyboard.js
@@ -1,5 +1,4 @@
-
-function openerp_pos_keyboard(instance, module){ //module is instance.point_of_sale
+openerp.point_of_sale.load_keyboard = function load_keyboard(instance, module){ //module is instance.point_of_sale
     "use strict";
     
     // ---------- OnScreen Keyboard Widget ----------

diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 43d0a92..ad4efcd 100644 (file)
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -1,4 +1,4 @@
-function openerp_pos_widgets(instance, module){ //module is instance.point_of_sale
+openerp.point_of_sale.load_widgets = function load_widgets(instance, module){ //module is instance.point_of_sale
     "use strict";
 
     var QWeb = instance.web.qweb;

diff --git a/addons/point_of_sale/views/point_of_sale.xml b/addons/point_of_sale/views/point_of_sale.xml
index 9e52ffe..2146a6d 100644 (file)
--- a/addons/point_of_sale/views/point_of_sale.xml
+++ b/addons/point_of_sale/views/point_of_sale.xml
@@ -7,6 +7,7 @@
             <xpath expr="." position="inside">
                 <script type="text/javascript" src="/point_of_sale/static/lib/fastclick.js"></script>
                 <script type="text/javascript" src="/point_of_sale/static/lib/waitfont.js"></script>
+                <script type="text/javascript" src="/point_of_sale/static/src/js/main.js"></script>
                 <script type="text/javascript" src="/point_of_sale/static/src/js/db.js"></script>
                 <script type="text/javascript" src="/point_of_sale/static/src/js/models.js"></script>
                 <script type="text/javascript" src="/point_of_sale/static/src/js/widget_base.js"></script>
@@ -15,7 +16,6 @@
                 <script type="text/javascript" src="/point_of_sale/static/src/js/devices.js"></script>
                 <script type="text/javascript" src="/point_of_sale/static/src/js/screens.js"></script>
                 <script type="text/javascript" src="/point_of_sale/static/src/js/tests.js"></script>
-                <script type="text/javascript" src="/point_of_sale/static/src/js/main.js"></script>
             </xpath>
         </template>
     </data>