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

Merge trunk

Browse Source 
bzr revid: ddm@openerp.com-20140203174624-ad5knhf7zo4rz36y
This commit is contained in:
ddm@openerp.com
2014-02-03 18:46:24 +01:00
parent af2db3b19d 2b6ec868e7
commit 6818f6f84b
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);