audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

FIX Reading wrong field for sequence type of SEPA DD

Browse Source 
Loop on bank payment lines instead of payment lines
This commit is contained in:
Alexis de Lattre
2015-09-24 12:29:43 +02:00
committed by Pedro M. Baeza
parent fc4b88c2db
commit dda5e1ccb5
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_banking_sepa_direct_debit/models/bank_payment_line.py
View File

@@ -37,5 +37,5 @@ class BankPaymentLine(models.Model):
""" """
hashcode = super(BankPaymentLine, self).\ hashcode = super(BankPaymentLine, self).\
move_line_transfer_account_hashcode() move_line_transfer_account_hashcode()
hashcode += self.mandate_id.type hashcode += '-' + unicode(self.mandate_id.recurrent_sequence_type)
return hashcode return hashcode

18
account_banking_sepa_direct_debit/wizard/export_sdd.py
View File

@@ -368,18 +368,18 @@ class BankingExportSddWizard(models.TransientModel):
to_expire_mandates = abmo.browse([]) to_expire_mandates = abmo.browse([])
first_mandates = abmo.browse([]) first_mandates = abmo.browse([])
all_mandates = abmo.browse([]) all_mandates = abmo.browse([])
for line in order.line_ids: for bline in order.bank_line_ids:
if line.mandate_id in all_mandates: if bline.mandate_id in all_mandates:
continue continue
all_mandates += line.mandate_id all_mandates += bline.mandate_id
if line.mandate_id.type == 'oneoff': if bline.mandate_id.type == 'oneoff':
to_expire_mandates += line.mandate_id to_expire_mandates += bline.mandate_id
elif line.mandate_id.type == 'recurrent': elif bline.mandate_id.type == 'recurrent':
seq_type = line.mandate_id.recurrent_sequence_type seq_type = bline.mandate_id.recurrent_sequence_type
if seq_type == 'final': if seq_type == 'final':
to_expire_mandates += line.mandate_id to_expire_mandates += bline.mandate_id
elif seq_type == 'first': elif seq_type == 'first':
first_mandates += line.mandate_id first_mandates += bline.mandate_id
all_mandates.write( all_mandates.write(
{'last_debit_date': fields.Date.context_today(self)}) {'last_debit_date': fields.Date.context_today(self)})
to_expire_mandates.write({'state': 'expired'}) to_expire_mandates.write({'state': 'expired'})