[MERGE] Forward-port saas-3 up to fc92027
authorOlivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 21:10:29 +0000 (23:10 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 21:10:29 +0000 (23:10 +0200)
commit7273474d6591f2dc62423c92eb5ec661d597716c
tree35b4011117d59770c5db01c4390a89edbcbd5891
parent8b15482e0037b2484e993ffaf9e5691662c99e28
parentfc920279797f8aef09c6e40b4b2fc1682823382e
[MERGE] Forward-port saas-3 up to fc92027
addons/website/views/website_templates.xml
addons/website_sale/controllers/main.py
openerp/osv/orm.py