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

[FIX] pos: malformed XML due to wrong conflict resolution in forward-port

Browse Source 
XML syntax error introduced in forward-port d38359821c
due to conflicts when porting commit 96f0c28b3d
This commit is contained in:
Olivier Dony
2015-07-31 11:04:20 +02:00
parent d38359821c
commit eec95afaac
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/xml/pos.xml
+4 -4
View File
@@ -1208,10 +1208,11 @@
</span>
<t t-if="order.get_client()">
<i class='fa fa-user'/>
<t t-esc="widget.order.get_client_name()"/>
<t t-esc="widget.order.get_client_name()"/>
</t>
<t t-if="!order.get_client()">Unknown Customer</t>:
<t t-esc="order.get('creationDate').toString('t')"/>
<t t-if="!order.get_client()">Unknown Customer</t>:
<t t-esc="order.get('creationDate').toString('t')"/>
</span>
</t>
<t t-if='order !== widget.pos.get_order()'>
<span class="order-button select-order" t-att-data-uid="order.uid">
@@ -1221,7 +1222,6 @@
</span>
</t>
</t>
</span>
<span class="order-button square neworder-button">
<i class='fa fa-plus' />