merge upstream

diff --cc addons/website_sale/views/templates.xml
index a86fa84,c43363b..c7e691d
--- 1/addons/website_sale/views/templates.xml
--- 2/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@@ -811,33 -642,29 +811,33 @@@
                                </td>
                                <td t-if="line.product_id.product_tmpl_id">
                                    <div>
 -                                      <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }">
 +                                      <a t-if="not line.linked_line_id" t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }">
                                            <strong t-esc="line.product_id.name_get()[0][1]"/>
                                        </a>
 +                                      <t t-if="line.linked_line_id">
 +                                        <strong t-esc="line.product_id.name_get()[0][1]"/>
 +                                      </t>
                                    </div>
 -                                  <div class="text-muted" t-field="line.product_id.description_sale"/>
 +                                  <div class="text-muted" t-field="line.name"/>
                                </td>
                                <td class="text-center" name="price">
 -                                <t t-if="abs(line.product_id.lst_price - line.price_unit) &gt; 0.2">
 -                                  <del class="text-danger"
 +                                <t t-if="(website.compute_curency(line.product_id.lst_price) - line.price_unit) &gt; 0.1">
 +                                  <del class="text-danger" style="white-space: nowrap;"
                                      t-field="line.product_id.lst_price" t-field-options='{
 -                                         "widget": "monetary",
 -                                         "display_currency": "website.pricelist_id.currency_id"
 +                                        "widget": "monetary",
 +                                        "from_currency": "website.company_currency_id",
 +                                        "display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
                                      }'/>&amp;nbsp;
                                  </t>
 -                                <span t-field="line.price_unit"  t-field-options='{
 +                                <span t-field="line.price_unit" style="white-space: nowrap;" t-field-options='{
                                       "widget": "monetary",
 -                                     "display_currency": "website.pricelist_id.currency_id"
 +                                     "display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
                                   }'/>
                                </td>
 -                              <td>
 -                                  <div class="input-group">
 +                              <td class="text-center">
 +                                  <div class="input-group" t-if="not line.linked_line_id">
                                        <span class="input-group-addon">
-                                           <a t-attf-href="#" class="mb8 js_add_cart_json">
+                                           <a t-attf-href="#" class="mb8 js_add_cart_json" data-no-instant="">
                                                <i class="fa fa-minus"></i>
                                            </a>
                                        </span>

diff --cc openerp/addons/base/ir/ir_qweb.py
Simple merge