[MERGE] from master
authorChristophe Matthieu <chm@odoo.com>
Fri, 13 Jun 2014 10:35:23 +0000 (12:35 +0200)
committerChristophe Matthieu <chm@odoo.com>
Fri, 13 Jun 2014 10:35:23 +0000 (12:35 +0200)
commit1e9c72f3088a05f42ac6ee99c3c23c6cd810eb84
tree10c7422b72b4346accb5d7a51d5836e3a259e27e
parent57c59ddfac2faa364cc07b404168a8da22f251f8
parent0f01df42eaf662987abe5f069ca8df2e2caf8e37
[MERGE] from master
addons/product/product.py
addons/website_sale/static/src/js/website_sale.js
addons/website_sale/views/views.xml