[MERGE] Sync with website-al main branch
authorThibault Delavallée <tde@openerp.com>
Tue, 21 Jan 2014 10:58:05 +0000 (11:58 +0100)
committerThibault Delavallée <tde@openerp.com>
Tue, 21 Jan 2014 10:58:05 +0000 (11:58 +0100)
commit93711b0f91c9fcb71ba9eeb4b7195160b4f013dc
tree5b09516d7b9373281d940fa4e860e1fbdfba46ad
parentb3a4778f26662ccfd007114774f66972db895360
parent51f6977f3947b74c7d6f18bea0d9d0e30a9a4454
[MERGE] Sync with website-al main branch

bzr revid: tde@openerp.com-20140121105805-msfn6i901v7kr2o3
addons/website_sale/views/website_sale.xml