diff options
| author | Frédéric van der Essen <fvdessen@gmail.com> | 2015-04-07 14:47:47 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fvdessen@gmail.com> | 2015-04-07 14:47:47 +0200 |
| commit | 12b6719423253776086144e1b4b171adafc1fb6d (patch) | |
| tree | 9f4a30c8773d35d9d03db54b2b0249bcca80693d | |
| parent | b5e1e14c5d1b147633086d489e50dbc42410ca3f (diff) | |
Revert "[IMP] point_of_sale : display change amount after print if not 0"
This reverts commit 46ad2ac70f8da3926ab36c0593190c88987b6e31.
| -rw-r--r-- | addons/point_of_sale/static/src/js/screens.js | 15 |
1 files 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); } |
