|
|
@ -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'); |
|
|
@ -267,7 +270,7 @@ odoo.define('pos_order_mgmt.widgets', function (require) { |
|
|
|
method: 'load_done_order_for_pos', |
|
|
|
args: [order_id], |
|
|
|
}).then(function (order_data) { |
|
|
|
self.gui.back(); |
|
|
|
self.gui.show_screen('orderlist'); |
|
|
|
var correct_order_print = true; |
|
|
|
if (action === 'return') { |
|
|
|
order_data.return = true; |
|
|
|