From 2c9cf343b9926e2f3080815ae7f08421fcf73fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 22 Nov 2013 12:47:08 +0100 Subject: [PATCH] [IMP] payment_acquirer: added utils methods to format partner address / name bzr revid: tde@openerp.com-20131122114708-c14ujol8lz90jnab --- addons/payment_acquirer/models/payment_acquirer.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/payment_acquirer/models/payment_acquirer.py b/addons/payment_acquirer/models/payment_acquirer.py index 69a026cba81..d7795a0a93e 100644 --- a/addons/payment_acquirer/models/payment_acquirer.py +++ b/addons/payment_acquirer/models/payment_acquirer.py @@ -7,6 +7,14 @@ import logging _logger = logging.getLogger(__name__) +def _partner_format_address(address1=False, address2=False): + return ' '.join((address1 or '', address2 or '')) + + +def _partner_split_name(partner_name): + return [' '.join(partner_name.split()[-1:]), ' '.join(partner_name.split()[:-1])] + + class ValidationError(ValueError): """ Used for value error when validating transaction data coming from acquirers. """ pass @@ -237,7 +245,7 @@ class PaymentTransaction(osv.Model): 'partner_lang': partner.lang, 'partner_email': partner.email, 'partner_zip': partner.zip, - 'partner_address': ' '.join((partner.street or '', partner.street2 or '')).strip(), + 'partner_address': _partner_format_address(partner.street, partner.street2), 'partner_city': partner.city, 'partner_country_id': partner.country_id.id, 'partner_phone': partner.phone,