From 78620132452ee79a6a97f8b680082ef041482916 Mon Sep 17 00:00:00 2001
From: Martin <mdo@odoo.com>
Date: Wed, 1 Apr 2015 11:58:55 +0200
Subject: [PATCH] [IMP] point_of_sale : display full note on receipt and
 display change after print

---
 addons/point_of_sale/static/src/js/screens.js  | 15 ++++++++++++---
 .../static/src/xml/multiprint.xml              | 18 ++++++++++--------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 2de500004d7..738ca739eb3 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -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);
                 }
diff --git a/addons/pos_restaurant/static/src/xml/multiprint.xml b/addons/pos_restaurant/static/src/xml/multiprint.xml
index babf264b1ba..4f3d0cf7379 100644
--- a/addons/pos_restaurant/static/src/xml/multiprint.xml
+++ b/addons/pos_restaurant/static/src/xml/multiprint.xml
@@ -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 />