Merge branch 'master' of https://github.com/odoo/odoo

[odoo/odoo.git] / addons / pos_restaurant / static / src / xml / multiprint.xml

diff --git a/addons/pos_restaurant/static/src/xml/multiprint.xml b/addons/pos_restaurant/static/src/xml/multiprint.xml
index 8f3027d..babf264 100644 (file)
--- a/addons/pos_restaurant/static/src/xml/multiprint.xml
+++ b/addons/pos_restaurant/static/src/xml/multiprint.xml
@@ -13,38 +13,56 @@
             align='center' 
             width='40' 
             size='double-height' 
-            line-ratio='0.6' 
+            line-ratio='0.4' 
             value-decimals='3' 
             value-thousands-separator=''
             value-autoint='on' 
         >
-            <div><t t-esc="changes.name" /></div>
+            <div size='normal' ><t t-esc="changes.name" /></div>
+            <t t-if="changes.floor || changes.table">
+                <br />
+                <div><span><t t-esc="changes.floor" /></span> / <span bold='on' size='double'><t t-esc="changes.table"/></span></div>
+            </t>
             <br />
             <br />
             <t t-if="changes.cancelled.length > 0">
                 <div color='red'>
-                    <div bold='on' size='double'>CANCELLED</div>
+                    <div bold='on' size='double'>CANCELLED <span bold='off' size='double-height'><t t-esc='changes.time.hours' />:<t t-esc='changes.time.minutes' /></span> </div>
                     <br />
                     <br />
                     <t t-foreach="changes.cancelled" t-as="change">
                         <line>
-                            <left><t t-esc="change.name" /></left>
-                            <right><value><t t-esc="change.quantity" /></value></right>
+                            <left><value><t t-esc="change.qty" /></value></left>
+                            <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>
+                        </t>
                     </t>
                     <br />
                     <br />
                 </div>
             </t>
             <t t-if="changes.new.length > 0">
-                <div bold='on' size='double'>NEW</div>
+                <div bold='on' size='double'>NEW <span bold='off' size='double-height'><t t-esc='changes.time.hours' />:<t t-esc='changes.time.minutes' /></span> </div>
                 <br />
                 <br />
                 <t t-foreach="changes.new" t-as="change">
                     <line>
-                        <left><t t-esc="change.name" /></left>
-                        <right><value><t t-esc="change.quantity" /></value></right>
+                        <left><value><t t-esc="change.qty" /></value></left>
+                        <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>
+                    </t>
                 </t>
                 <br />
                 <br />