[MERGE] Forward-port saas-4 up to 2694ed1
authorOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 15:33:34 +0000 (17:33 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 15:34:27 +0000 (17:34 +0200)
commit2a94d1d8117847ef2cd1f904de3fe1b4c45779f6
treefdd396b7f4d223d7cdff19244b16376530b2f5ec
parentca55a2437444cf3e5231ee8edff9e60049da38ba
parent2694ed1472c987d8b4e713f62183d5ecd419c58c
[MERGE] Forward-port saas-4 up to 2694ed1
addons/account/account_invoice.py
addons/account_followup/account_followup.py
addons/web/controllers/main.py
openerp/osv/orm.py