pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] point_of_sale: open the cashbox on payment validation

Browse Source 
bzr revid: fva@openerp.com-20140203153233-zj12w2o1uxyz5hoq
This commit is contained in:
Frédéric van der Essen
2014-02-03 16:32:33 +01:00
parent 51520b3393 73569da5e8
commit 2b6ec868e7
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/js/screens.js
+7 -6
View File
@@ -936,12 +936,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
document.body.addEventListener('keyup', this.hotkey_handler);
if( this.pos.config.iface_cashdrawer
&& this.pos.get('selectedOrder').get('paymentLines').find( function(pl){
return pl.cashregister.journal.type === 'cash';
})){
this.pos.proxy.open_cashbox();
}
this.add_action_button({
@@ -1145,6 +1139,13 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
return;
}
if( this.pos.config.iface_cashdrawer
&& this.pos.get('selectedOrder').get('paymentLines').find( function(pl){
return pl.cashregister.journal.type === 'cash';
})){
this.pos.proxy.open_cashbox();
}
if(options.invoice){
// deactivate the validation button while we try to send the order
this.pos_widget.action_bar.set_button_disabled('validation',true);