odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Revert "[IMP] point_of_sale : display change amount after print if not 0" 

This reverts commit 46ad2ac70f.
This commit is contained in:
Frédéric van der Essen 2015-04-07 14:47:47 +02:00
parent b5e1e14c5d
commit 12b6719423
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/point_of_sale/static/src/js/screens.js
View File

@ -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);
}