[MERGE] from trunk + vidanges template

bzr revid: fva@openerp.com-20120905120950-vav9los6xgfhq93s

diff --cc addons/locadis/static/src/xml/pos.xml
index 5ce2339,0000000..0a5ce16
mode 100644,000000..100644
--- 1/addons/locadis/static/src/xml/pos.xml
--- /dev/null
+++ b/addons/locadis/static/src/xml/pos.xml
@@@ -1,14 -1,0 +1,25 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<templates id="template" xml:space="preserve">
 +
 +    <t t-name="ProductEmptyListWidget">
 +        <div class='product-list-container'>
 +            <div class="product-list-scroller product-list-empty">
 +                <img src="/point_of_sale/static/src/img/scan.png" />
 +                <p>Please scan your products</p>
 +            </div>
 +            <div class="shadow-top"></div>
 +        </div>
 +    </t>
++
++    <t t-extend="OrderlineWidget">
++        
++        <t t-jquery=".info-list" t-operation="append">
++            <t t-if="widget.dont_vidange">
++                <li class="info">
++                    Vidange: <t t-esc="widget.format_currency(widget.dont_vidange)" />
++                </li>
++            </t>
++        </t>
++    </t>
 +    
 +</templates>