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

[MERGE] fixes from trunk-pos-fva

Browse Source 
bzr revid: fva@openerp.com-20120905210958-zm1xmz8kn5w000i2
This commit is contained in:
Frédéric van der Essen
2012-09-05 23:09:58 +02:00
parent 87f5de0b07 b2cb4b841d
commit 9f6786c139
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/js/screens.js
+2 -2
View File
@@ -188,7 +188,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
return true;
}
}
this.pos.proxy.scan_item_unrecognized(ean);
this.pos.proxy.scan_item_error_unrecognized(ean);
return false;
},
@@ -206,7 +206,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
return true;
}
}
this.pos.proxy.scan_item_unrecognized(ean);
this.pos.proxy.scan_item_error_unrecognized(ean);
return false;
//TODO start the transaction
},
addons/point_of_sale/static/src/xml/pos.xml
+1 -1
View File
@@ -346,7 +346,7 @@
<t t-name="ErrorPopupWidget">
<div class="modal-dialog">
<div class="popup popup-help">
<p class="message"><t t-esc=" widget.message || 'Error.' " /></p>
<p class="message"><t t-esc=" widget.message || 'Product not Found' " /></p>
</div>
</div>
</t>