Skip to content
Extraits de code Groupes Projets
Valider abff0504 rédigé par jordan's avatar jordan
Parcourir les fichiers

[fix] compute_state is not dependent of lettrage

parent 901bfdb6
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -95,11 +95,8 @@ class ScopCotisationsIDF(models.Model):
"""
partners = set(self.mapped('partner_id'))
years = set(self.mapped('year'))
letters = set(self.mapped('lettrage'))
for year in years:
for partner in partners:
for letter in letters:
# Group lines by partner, year, letter
invoice_lines = self.search([
['year', '=', year],
['partner_id', '=', partner.id],
......@@ -113,15 +110,15 @@ class ScopCotisationsIDF(models.Model):
for invoice in invoices:
if invoice.amount_residual > 0:
invoice.state = 'awaiting_payments'
for r in invoice.payment_or_refund_ids:
for r in invoice.payments_ids:
r.state = 'awaiting_payments'
elif invoice.amount_residual < 0:
invoice.state = 'overpaid'
for r in invoice.payment_or_refund_ids:
for r in invoice.payments_ids:
r.state = 'overpaid'
else:
invoice.state = 'paid'
for r in invoice.payment_or_refund_ids:
for r in invoice.payments_ids:
r.state = 'paid'
@api.multi
......
......@@ -90,15 +90,11 @@ class ScopInvoiceIDF(models.Model):
"""
partners = set(self.mapped('partner_id'))
years = set(self.mapped('year'))
letters = set(self.mapped('lettrage'))
for year in years:
for partner in partners:
for letter in letters:
# Group lines by partner, year, letter
invoice_lines = self.search([
['year', '=', year],
['partner_id', '=', partner.id],
['lettrage', '=', letter]])
['partner_id', '=', partner.id], ])
invoices = invoice_lines.filtered(
lambda l: l.type == 'inv')
if not invoices:
......@@ -108,15 +104,15 @@ class ScopInvoiceIDF(models.Model):
for invoice in invoices:
if invoice.amount_residual > 0:
invoice.state = 'awaiting_payments'
for r in invoice.payment_or_refund_ids:
for r in invoice.payments_ids:
r.state = 'awaiting_payments'
elif invoice.amount_residual < 0:
invoice.state = 'overpaid'
for r in invoice.payment_or_refund_ids:
for r in invoice.payments_ids:
r.state = 'overpaid'
else:
invoice.state = 'paid'
for r in invoice.payment_or_refund_ids:
for r in invoice.payments_ids:
r.state = 'paid'
@api.multi
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter