diff options
| author | Olivier Dony <odo@openerp.com> | 2015-07-31 11:02:12 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2015-07-31 11:04:20 +0200 |
| commit | eec95afaac04cfe36dd24f7c19b6c86e791e8c72 (patch) | |
| tree | 07c01abc16fd6eab850a21e4ee7a4f98e806bf49 | |
| parent | d38359821c2dbadccd9f1047124f5636df6bdc89 (diff) | |
[FIX] pos: malformed XML due to wrong conflict resolution in forward-port
XML syntax error introduced in forward-port d38359821c2dbadccd9f1047124f5636df6bdc89
due to conflicts when porting commit 96f0c28b3d66ae174765d271732043581b285c61
| -rw-r--r-- | addons/point_of_sale/static/src/xml/pos.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 55f29b0e619..c386fd1f60d 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -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' /> |