[MERGE] Sync with website-al
authorThibault Delavallée <tde@openerp.com>
Thu, 31 Oct 2013 10:27:49 +0000 (11:27 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 31 Oct 2013 10:27:49 +0000 (11:27 +0100)
commit420cdb13a2b08528ae9e6622e88f09c74e7d8644
treeb0dbca6793e1d9477b275dbc2f967cd3dcfc4320
parent720cdad62ec249d7e15f67540e126350342b93bf
parente44b7c9fa047d7abe778098ec1a55cd73e68d81b
[MERGE] Sync with website-al

bzr revid: tde@openerp.com-20131031102749-mzn5bqcunwuo1hsf
addons/website_sale/controllers/main.py
addons/website_sale/views/website_sale.xml