Remove issue9797.diff

This commit is contained in:
Raimon Esteve 2021-10-15 19:25:40 +02:00
parent 34873c181c
commit 124d5d5406
2 changed files with 1 additions and 36 deletions

View File

@ -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:

4
series
View File

@ -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
sao_colors.diff # [sao] Use the same colors as 5.4 version