diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2014-01-29 14:57:10 +0100 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2014-01-29 14:57:10 +0100 |
| commit | 4e73dce8d33e29501e4b7fe81d2920be07b2d903 (patch) | |
| tree | 33eb8c88674de80b9ecaaf736d1af16d33d3aa81 | |
| parent | 7de8b5c615e735b6a86f6a014821dd8d5ac32f28 (diff) | |
[FIX] point_of_sale: loading screen was not waiting until posbox connection
bzr revid: fva@openerp.com-20140129135710-vobqzjyq12d7io3v
| -rw-r--r-- | addons/point_of_sale/static/src/js/models.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index f623b21374c..d2631358946 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -92,6 +92,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal }, connect_to_proxy: function(){ var self = this; + var done = new $.Deferred(); this.barcode_reader.disconnect_from_proxy(); this.pos_widget.loading_message(_t('Connecting to the PosBox'),0); this.pos_widget.loading_skip(function(){ @@ -106,7 +107,10 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal if(self.config.iface_scan_via_proxy){ self.barcode_reader.connect_to_proxy(); } + }).always(function(){ + done.resolve(); }); + return done; }, // helper function to load data from the server |
