Merge PR #339 into 11.0

Signed-off-by legalsylvain

pos_order_mgmt/README.rst

@@ -105,6 +105,7 @@ Contributors
 * David Vidal <david.vidal@tecnativa.com>
 * Sylvain LE GAL (https://twitter.com/legalsylvain)
 * Carlos Martínez <carlos@domatix.com>
+* Pierrick Brun <pierrick.brun@akretion.com>
 
 Maintainers
 ~~~~~~~~~~~

pos_order_mgmt/__manifest__.py

@@ -5,7 +5,7 @@
 {
     'name': 'POS Frontend Orders Management',
     'summary': 'Manage old POS Orders from the frontend',
-    'version': '11.0.1.0.2',
+    'version': '11.0.1.0.3',
     'category': 'Point of Sale',
     'author': 'GRAP, '
               'Tecnativa, '

pos_order_mgmt/i18n/pos_order_mgmt.pot

@@ -39,16 +39,16 @@ msgstr ""
 
 #. module: pos_order_mgmt
 #. openerp-web
-#: code:addons/pos_order_mgmt/static/src/js/widgets.js:303
-#: code:addons/pos_order_mgmt/static/src/js/widgets.js:338
+#: code:addons/pos_order_mgmt/static/src/js/widgets.js:312
+#: code:addons/pos_order_mgmt/static/src/js/widgets.js:347
 #, python-format
 msgid "Can not execute this action because the POS is currently offline"
 msgstr ""
 
 #. module: pos_order_mgmt
 #. openerp-web
-#: code:addons/pos_order_mgmt/static/src/js/widgets.js:302
-#: code:addons/pos_order_mgmt/static/src/js/widgets.js:337
+#: code:addons/pos_order_mgmt/static/src/js/widgets.js:311
+#: code:addons/pos_order_mgmt/static/src/js/widgets.js:346
 #, python-format
 msgid "Connection error"
 msgstr ""
@@ -128,7 +128,7 @@ msgstr ""
 
 #. module: pos_order_mgmt
 #. openerp-web
-#: code:addons/pos_order_mgmt/static/src/js/widgets.js:280
+#: code:addons/pos_order_mgmt/static/src/js/widgets.js:289
 #, python-format
 msgid "Unable to load some order lines because the products are not available in the POS cache.\n"
 "\n"
@@ -139,7 +139,7 @@ msgstr ""
 
 #. module: pos_order_mgmt
 #. openerp-web
-#: code:addons/pos_order_mgmt/static/src/js/widgets.js:279
+#: code:addons/pos_order_mgmt/static/src/js/widgets.js:288
 #, python-format
 msgid "Unknown Products"
 msgstr ""

pos_order_mgmt/readme/CONTRIBUTORS.rst

@@ -1,3 +1,4 @@
 * David Vidal <david.vidal@tecnativa.com>
 * Sylvain LE GAL (https://twitter.com/legalsylvain)
 * Carlos Martínez <carlos@domatix.com>
+* Pierrick Brun <pierrick.brun@akretion.com>

pos_order_mgmt/static/description/index.html

@@ -452,6 +452,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <li>David Vidal &lt;<a class="reference external" href="mailto:david.vidal&#64;tecnativa.com">david.vidal&#64;tecnativa.com</a>&gt;</li>
 <li>Sylvain LE GAL (<a class="reference external" href="https://twitter.com/legalsylvain">https://twitter.com/legalsylvain</a>)</li>
 <li>Carlos Martínez &lt;<a class="reference external" href="mailto:carlos&#64;domatix.com">carlos&#64;domatix.com</a>&gt;</li>
+<li>Pierrick Brun &lt;<a class="reference external" href="mailto:pierrick.brun&#64;akretion.com">pierrick.brun&#64;akretion.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

pos_order_mgmt/static/src/js/widgets.js

@@ -63,7 +63,10 @@ odoo.define('pos_order_mgmt.widgets', function (require) {
 
         show: function () {
             var self = this;
-            var previous_screen = this.pos.get_order().get_screen_data('previous-screen');
+            var previous_screen;
+            if (this.pos.get_order()) {
+                previous_screen = this.pos.get_order().get_screen_data('previous-screen');
+            }
             if (previous_screen === 'receipt') {
                 this.gui.screen_instances.receipt.click_next();
                 this.gui.show_screen('orderlist');
@@ -72,7 +75,11 @@ odoo.define('pos_order_mgmt.widgets', function (require) {
             this.renderElement();
             this.old_order = this.pos.get_order();
             this.$('.back').click(function () {
+              if (self.old_order !== null) {
+                self.gui.back();
+              } else {
                 return self.gui.show_screen(self.gui.startup_screen);
+              }
             });
             if (self.orders.length === 0) {
                 this.search_done_orders();
@@ -267,7 +274,9 @@ odoo.define('pos_order_mgmt.widgets', function (require) {
                 method: 'load_done_order_for_pos',
                 args: [order_id],
             }).then(function (order_data) {
+                if (self.old_order !== null) {
                   self.gui.back();
+                }
                 var correct_order_print = true;
                 if (action === 'return') {
                     order_data.return = true;