[MERGE] Forward-port saas-4 up to 8b15482
authorOlivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 11:06:49 +0000 (13:06 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 11:06:49 +0000 (13:06 +0200)
commitee4df1e397a7f1ada09f53c3b72d9dddfa9b3e22
tree438b018b377a0c94be1d19e4c3928974b9d18f08
parent5ddc0305cd0bef77632ee50fb19ae7372ae5cb68
parent8b15482e0037b2484e993ffaf9e5691662c99e28
[MERGE] Forward-port saas-4 up to 8b15482
addons/account/account_invoice.py
addons/mail/mail_thread.py
addons/mass_mailing/controllers/main.py
addons/mass_mailing/models/mass_mailing.py
addons/web/static/src/xml/base.xml
addons/website_customer/controllers/main.py
openerp/osv/orm.py