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

[IMP] point_of_sale : display full note on receipt and display change after print

Browse Source
This commit is contained in:
Martin
2015-04-01 15:26:34 +02:00
parent 734060f5b1
commit 7862013245
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/js/screens.js
+12 -3
View File
@@ -1322,7 +1322,9 @@ openerp.point_of_sale.load_screens = function load_screens(instance, module){ //
this.refresh();
if (!this.pos.get_order()._printed && this.pos.config.iface_print_auto) {
if (!this.pos.get_order()._printed &&
!this.pos.config.iface_print_via_proxy &&
this.pos.config.iface_print_auto) {
this.print();
}
@@ -1793,10 +1795,17 @@ openerp.point_of_sale.load_screens = function load_screens(instance, module){ //
order.finalize();
});
} else {
this.pos.push_order(order)
this.pos.push_order(order);
var cO = this.pos.get('selectedOrder');
var isChange = cO.get_total_paid() > cO.get_total_with_tax();
if (this.pos.config.iface_print_via_proxy) {
this.print_escpos_receipt();
order.finalize(); //finish order and go back to scan screen
if (isChange) {
this.gui.show_screen(this.next_screen);
}
else {
order.finalize(); //finish order and go back to scan screen
}
} else {
this.gui.show_screen(this.next_screen);
}
addons/pos_restaurant/static/src/xml/multiprint.xml
+10 -8
View File
@@ -36,11 +36,12 @@
<right><t t-esc="change.name" /></right>
</line>
<t t-if="change.note">
<line font='b' bold='off' indent='1' line-ratio='1'>
<left>
<span>---</span> <span><t t-esc="change.note" /></span>
</left>
<line>
<left>NOTE</left>
<right>...</right>
</line>
<div><span font='b' bold='off' line-ratio='0.4' indent='1' width='30'>--- <t t-esc="change.note" /></span></div>
<line></line>
</t>
</t>
<br />
@@ -57,11 +58,12 @@
<right><t t-esc="change.name" /></right>
</line>
<t t-if="change.note">
<line font='b' bold='off' indent='1' line-ratio='1'>
<left>
<span>---</span> <span><t t-esc="change.note" /></span>
</left>
<line>
<left>NOTE</left>
<right>...</right>
</line>
<div><span font='b' bold='off' line-ratio='0.4' indent='1' width='30'>--- <t t-esc="change.note" /></span></div>
<line></line>
</t>
</t>
<br />