From 12b6719423253776086144e1b4b171adafc1fb6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Tue, 7 Apr 2015 14:47:47 +0200 Subject: [PATCH] Revert "[IMP] point_of_sale : display change amount after print if not 0" This reverts commit 46ad2ac70f8da3926ab36c0593190c88987b6e31. --- addons/point_of_sale/static/src/js/screens.js | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index e7fb373676a..6a813f2d574 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -946,8 +946,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa this.refresh(); - if (!this.pos.get('selectedOrder')._printed && - !this.pos.config.iface_print_via_proxy) { + if (!this.pos.get('selectedOrder')._printed) { this.print(); } @@ -1328,21 +1327,13 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }); }else{ - this.pos.push_order(currentOrder); - var cO = this.pos.get('selectedOrder'); - var isChange = cO.getPaidTotal() > cO.getTotalTaxIncluded(); - + this.pos.push_order(currentOrder) if(this.pos.config.iface_print_via_proxy){ var receipt = currentOrder.export_for_printing(); this.pos.proxy.print_receipt(QWeb.render('XmlReceipt',{ receipt: receipt, widget: self, })); - if(isChange) { - this.pos_widget.screen_selector.set_current_screen(this.next_screen); - } - else { - this.pos.get('selectedOrder').destroy(); //finish order and go back to scan screen - } + this.pos.get('selectedOrder').destroy(); //finish order and go back to scan screen }else{ this.pos_widget.screen_selector.set_current_screen(this.next_screen); }