diff --git a/addons/payment/models/account_payment.py b/addons/payment/models/account_payment.py index 732ba6c4a7c..52b1e9954e1 100644 --- a/addons/payment/models/account_payment.py +++ b/addons/payment/models/account_payment.py @@ -12,8 +12,6 @@ class AccountPayment(models.Model): payment_transaction_id = fields.Many2one('payment.transaction', string="Payment Transaction") payment_token_id = fields.Many2one('payment.token', string="Saved payment token", domain=[('acquirer_id.auto_confirm', '!=', 'authorize')], help="Note that tokens from acquirers set to only authorize transactions (instead of capturing the amount) are not available.") - payment_type = fields.Selection(selection_add=[('electronic', 'Electronically receive money')]) - payment_method_id_code = fields.Char(related='payment_method_id.code') @api.onchange('partner_id') def _onchange_partner_id(self): @@ -25,7 +23,7 @@ class AccountPayment(models.Model): @api.onchange('payment_method_id', 'journal_id') def _onchange_payment_method(self): - if self.payment_method_id.code == 'electronic': + if self.payment_method_code == 'electronic': self.payment_token_id = self.env['payment.token'].search([('partner_id', '=', self.partner_id.id), ('acquirer_id.auto_confirm', '!=', 'authorize')], limit=1) else: self.payment_token_id = False @@ -59,4 +57,4 @@ class AccountPayment(models.Model): if not s2s_result or tx.state != 'done': raise ValidationError(_("Payment transaction failed (%s)") % tx.state_message) - self.payment_transaction_id = tx + self.payment_transaction_id = tx \ No newline at end of file diff --git a/addons/payment/views/account_payment_views.xml b/addons/payment/views/account_payment_views.xml index 884241500e6..a284f69b77f 100644 --- a/addons/payment/views/account_payment_views.xml +++ b/addons/payment/views/account_payment_views.xml @@ -18,11 +18,12 @@ - - + + +