[MERGE] forward port of branch saas-3 up to c914893
authorChristophe Simonis <chs@odoo.com>
Thu, 28 Aug 2014 17:25:08 +0000 (19:25 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 28 Aug 2014 17:25:08 +0000 (19:25 +0200)
commit010dd7089448255b75970c25b04a8abfacfdb233
treeeb0f5fb9b6fabfad1833397c07c16ee1868432b2
parent7e117b18a01d55c85856050eba7f1983bc2c34e9
parentc914893f6f8f8453170366e35d08b7443fcaf80c
[MERGE] forward port of branch saas-3 up to c914893
addons/account/account_invoice.py
addons/email_template/wizard/mail_compose_message.py
addons/mail/mail_message.py
openerp/addons/base/security/ir.model.access.csv