[MERGE] forward port of branch saas-5 up to b1c0bc0
authorChristophe Simonis <chs@odoo.com>
Tue, 3 Jun 2014 18:02:00 +0000 (20:02 +0200)
committerChristophe Simonis <chs@odoo.com>
Tue, 3 Jun 2014 18:02:00 +0000 (20:02 +0200)
commita5908c58127e599688c1f3e3138565704a73f887
tree8a7d23f5c2ab30a2bd50a2c35c58d2079aaf999f
parentc3275e346a16ebf3035a89034ae46c13bceaab57
parentb1c0bc0b46c85038a2ac16d8603e4b723a53baf4
[MERGE] forward port of branch saas-5 up to b1c0bc0
addons/product/product.py
addons/product/product_view.xml
addons/website_sale/views/templates.xml