[MERGE] Sync with website-al main branch
authorThibault Delavallée <tde@openerp.com>
Thu, 7 Nov 2013 17:23:39 +0000 (18:23 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 7 Nov 2013 17:23:39 +0000 (18:23 +0100)
commit35619dfe125756c0911ad403e746e4a92d8046ae
treec94d91c67149543fe47e3653023a58544fff00e8
parentf586b49e58069ba54294d8ef65abe3cfb6c5c807
parentec2a9776ab081bb307d142c4b0f8b205d9503f32
[MERGE] Sync with website-al main branch

bzr revid: tde@openerp.com-20131107172339-zjpa2xmtf2xql9eu
addons/website_sale/controllers/main.py
addons/website_sale/models/product_attributes.py
addons/website_sale/static/src/js/website_sale.js
addons/website_sale/views/website_sale.xml