[MERGE] Sync with website-al

bzr revid: tde@openerp.com-20131024131445-zaxaw5rpu681gwoz

diff --cc addons/website_sale/controllers/main.py
Simple merge

diff --cc addons/website_sale/static/src/js/website_sale.js
Simple merge

diff --cc addons/website_sale/views/website_sale.xml
index 41e4663,eb4c5fc..dc18c0c
--- 1/addons/website_sale/views/website_sale.xml
--- 2/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@@ -284,22 -285,16 +285,23 @@@
                                <br/>
                            </t>
  
-                           <div class="product_price mt16">
+                           <div class="product_price mt16" t-if="product.product_variant_ids">
                                <h4>
+                                   <b><span class="oe_price" t-esc="product.product_variant_ids[0].price" /> €</b>
 -
                                    <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
 -                                    <span class="text-danger" style="text-decoration: line-through;">
 -                                        <t t-esc="product.product_variant_ids[0].lst_price" /> €
 -                                    </span>&amp;nbsp;
 +                                  <span class="text-danger" style="text-decoration: line-through;"
 +                                    t-field="product.product_variant_ids[0].lst_price"
 +                                    t-field-options='{
 +                                       "widget": "monetary",
 +                                       "display_currency": "website.pricelist_id.currency_id"
 +                                   }'/><br/>
                                    </t>
 -                                  <h4><b><span class="oe_price" t-esc="product.product_variant_ids[0].price" /> €</b></h4>
 +                                  <b class="oe_price"
 +                                    t-field="product.product_variant_ids[0].price"
 +                                    t-field-options='{
 +                                       "widget": "monetary",
 +                                       "display_currency": "website.pricelist_id.currency_id"
 +                                   }'/>
                                </h4>
                            </div>
                            <button class="btn btn-primary btn-lg mt8">Add to Cart</button>