[MERGE] forward port branch 11.0 up to 2835d299792

1 files changed, 7 insertions, 9 deletions

diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index d68df6f9934..d9617a633a2 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -313,6 +313,7 @@ class PaymentAcquirer(models.Model):
                 'billing_partner': billing_partner,
                 'billing_partner_id': billing_partner_id,
                 'billing_partner_name': billing_partner.name,
+                'billing_partner_commercial_company_name': billing_partner.commercial_company_name,
                 'billing_partner_lang': billing_partner.lang,
                 'billing_partner_email': billing_partner.email,
                 'billing_partner_zip': billing_partner.zip,
@@ -845,16 +846,13 @@ class PaymentToken(models.Model):
             'partner_country_id': self.partner_id.country_id.id,
         })
 
-        try:
-            kwargs.update({'3d_secure': True})
-            tx.s2s_do_transaction(**kwargs)
-            # if 3D secure is called, then we do not refund right now
-            if tx.html_3ds:
-                return tx
-        except:
-            _logger.error('Error while validating a payment method')
-        finally:
+        kwargs.update({'3d_secure': True})
+        tx.s2s_do_transaction(**kwargs)
+
+        # if 3D secure is called, then we do not refund right now
+        if not tx.html_3ds:
             tx.s2s_do_refund()
+
         return tx
 
     @api.multi