From de23d92e82bc71793cf004f035332bc38232376f Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 6 May 2016 22:14:56 +0200 Subject: [PATCH] Finalise merge of account_banking_payment_transfer into account_payment_order Add support for transfer moves Display transfer moves in a dedicated tab in payment order view Code cleanup --- .../models/account_payment_mode.py | 17 +---------------- .../models/banking_export_pain.py | 2 +- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/account_banking_pain_base/models/account_payment_mode.py b/account_banking_pain_base/models/account_payment_mode.py index 48febc536..fd36ea3cd 100644 --- a/account_banking_pain_base/models/account_payment_mode.py +++ b/account_banking_pain_base/models/account_payment_mode.py @@ -4,7 +4,7 @@ # © 2016 Antiun Ingenieria S.L. - Antonio Espinosa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields, api +from openerp import models, fields class AccountPaymentMode(models.Model): @@ -33,18 +33,3 @@ class AccountPaymentMode(models.Model): "- Country code (2, optional)\n" "- Company idenfier (N, VAT)\n" "- Service suffix (N, issued by bank)") - # I plan to change this -- Alexis - #sepa_type = fields.Char(compute="_compute_sepa_type") - - #def _sepa_type_get(self): - # """Defined to be inherited by child addons, for instance: - # - account_banking_sepa_credit_transfer - # - account_banking_sepa_direct_debit - # """ - # return False - - #@api.multi - #@api.depends('type') - #def _compute_sepa_type(self): - # for mode in self: - # mode.sepa_type = mode._sepa_type_get() diff --git a/account_banking_pain_base/models/banking_export_pain.py b/account_banking_pain_base/models/banking_export_pain.py index af178327d..ab3a05383 100644 --- a/account_banking_pain_base/models/banking_export_pain.py +++ b/account_banking_pain_base/models/banking_export_pain.py @@ -283,7 +283,7 @@ class AccountPaymentOrder(models.Model): viban = self._prepare_field( '%s IBAN' % party_type_label, iban, eval_ctx, gen_args=gen_args) # TODO : add support for bank accounts other than IBAN - #viban = self._validate_iban(piban) + # viban = self._validate_iban(piban) # At C level, the order is : BIC, Name, IBAN # At B level, the order is : Name, IBAN, BIC if order == 'B':