[MERGE] forward port of branch saas-3 up to ebf317a
authorDenis Ledoux <dle@odoo.com>
Mon, 4 Aug 2014 14:14:05 +0000 (16:14 +0200)
committerDenis Ledoux <dle@odoo.com>
Mon, 4 Aug 2014 14:14:05 +0000 (16:14 +0200)
commit8c0c74300fe703cd527358455cc3cb228ba95a8a
treec31efed700e74f3652ebe64e0a0bc5e4e2d86c58
parent5af8868c46c6f9a0e52b2c83fbb045a5a7bbb4d9
parentebf317a3b0e8b6ded28eadaf698f56536eb91736
[MERGE] forward port of branch saas-3 up to ebf317a
addons/payment/models/payment_acquirer.py
addons/payment_paypal/models/paypal.py
openerp/addons/base/res/res_partner.py
openerp/addons/base/tests/test_base.py