From 124d5d5406a15e722b1fdb5078f6fb1a84bba153 Mon Sep 17 00:00:00 2001 From: Raimon Esteve Date: Fri, 15 Oct 2021 19:25:40 +0200 Subject: [PATCH] Remove issue9797.diff --- issue9797.diff | 33 --------------------------------- series | 4 +--- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 issue9797.diff diff --git a/issue9797.diff b/issue9797.diff deleted file mode 100644 index b59ec61..0000000 --- a/issue9797.diff +++ /dev/null @@ -1,33 +0,0 @@ -index ac29d17..2b240c1 100644 ---- a/trytond/trytond/modules/account_payment_sepa/payment.py -+++ b/trytond/trytond/modules/account_payment_sepa/payment.py -@@ -190,18 +190,23 @@ class Group(metaclass=PoolMeta): - Payment = pool.get('account.payment') - if self.kind == 'receivable': - mandates = Payment.get_sepa_mandates(self.payments) -+ sequence_types = {} - for payment, mandate in zip(self.payments, mandates): - if not mandate: - raise ProcessError( - gettext('account_payment_sepa' - '.msg_payment_process_no_mandate', - payment=payment.rec_name)) -- # Write one by one because mandate.sequence_type must be -- # recomputed each time -- Payment.write([payment], { -- 'sepa_mandate': mandate, -- 'sepa_mandate_sequence_type': mandate.sequence_type, -- }) -+ sequence_type = sequence_types.get(mandate) -+ if not sequence_type: -+ sequence_type = mandate.sequence_type -+ if sequence_type == 'FRST': -+ sequence_types[mandate] = 'RCUR' -+ else: -+ sequence_types[mandate] = sequence_type -+ payment.sepa_mandate = mandate -+ payment.sepa_mandate_sequence_type = sequence_type -+ Payment.save(self.payments) - else: - for payment in self.payments: - if not payment.sepa_bank_account_number: diff --git a/series b/series index abf940e..cbf35e6 100644 --- a/series +++ b/series @@ -21,10 +21,8 @@ statement_of_account.diff # [account] Cumulate balance of previous fiscal years model.diff # [trytond] Allows dynamic fields in Model as required by the wizard in sale_pos_template_quantities -issue9797.diff # [account_payment_sepa] Slowness processing sepa - issue9802.diff # [stock] Improve performance when partially assigning moves issue10464.diff # [currency] Update currency rates fails -sao_colors.diff # [sao] Use the same colors as 5.4 version \ No newline at end of file +sao_colors.diff # [sao] Use the same colors as 5.4 version