From b9d62abd9a3d26dded49f74edd8f253b57b5ed73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 30 Jul 2012 11:19:46 +0200
Subject: [PATCH] [FIX] point of sale: removed forgotten tree/merge, probably
 due to a forgotten conflict to resolve.

bzr revid: tde@openerp.com-20120730091946-3ml79eb6u4flzina
---
 addons/point_of_sale/static/src/xml/pos.xml | 58 ---------------------
 1 file changed, 58 deletions(-)

diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index e76080fdfd3..42af5d572ca 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -113,62 +113,6 @@
                 <img class="search-clear" src="/point_of_sale/static/src/img/search_reset.gif" />
             </div>
         </header>
-<<<<<<< TREE
-        <div id="categories">
-            <ol>
-                <t t-foreach="categories" t-as="category">
-                    <li class="oe_pos_categories_list">
-                        <a href="javascript:void(0)" t-att-data-category-id="category.id" class="button">
-                            <t t-esc="category.name"/>
-                        </a>
-                    </li>
-                </t>
-            </ol>
-        </div>
-    </t>
-    <t t-name="pos-product-template">
-        <a href="#">
-            <div class="product-img">
-                <img t-att-src="'data:image/gif;base64,'+ image_medium" />
-                <span class="price-tag">
-                    <t t-esc="format_amount(list_price)"/>
-                </span>
-            </div>
-            <div class="product-name">
-                <t t-esc="name"/>
-            </div>
-        </a>
-    </t>
-    <t t-name="pos-orderline-template">
-        <td>
-            <t t-esc="name"/>
-        </td>
-        <td>
-            <t t-esc="format_amount(list_price.toFixed(2))"/>
-        </td>
-        <td>
-            <t t-esc="discount.toFixed(2)"/>
-        </td>
-        <td>
-            <t t-esc="quantity.toFixed(0)"/>
-        </td>
-        <td>
-            <t t-esc="format_amount((list_price * (1 - discount/100) * quantity).toFixed(2))"/>
-        </td>
-    </t>
-    <t t-name="pos-paymentline-template">
-        <td class="paymentline-type">
-            <t t-esc="name"/>
-        </td>
-        <td class="paymentline-amount pos-right-align">
-            <input type="text" t-att-value="amount.toFixed(2)" />
-            <a href='javascript:void(0)' class='delete-payment-line'><img src="/point_of_sale/static/src/img/search_reset.gif" /></a>
-        </td>
-    </t>
-    <t t-name="pos-payment-button-template">
-        <button class="payment-button" t-att-cash-register-id="id">
-            <t t-esc="name"/>
-=======
         <t t-if="widget.subcategories.length > 0">
             <div id="categories">
                 <div class="white-gradient"></div>
@@ -398,7 +342,6 @@
         <li class='product'>
             <a href="#">
                 <div class="product-img">
-                    
                     <img t-att-src="'data:image/gif;base64,'+ widget.model.get('image_small')" />
                     <t t-if="!widget.model.get('to_weight')">
                         <span class="price-tag">
@@ -506,7 +449,6 @@
     <t t-name="PaypadButtonWidget">
         <button class="paypad-button" t-att-cash-register-id="widget.cashRegister.get('id')">
             <t t-esc="widget.cashRegister.get('journal').name"/>
->>>>>>> MERGE-SOURCE
         </button>
         <br />
     </t>