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

[add] compute has_outstanding to add filter on tree view

parent ea45f0fe
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!212.0 dev
...@@ -192,7 +192,8 @@ class Bordereau(models.Model): ...@@ -192,7 +192,8 @@ class Bordereau(models.Model):
) )
has_outstanding = fields.Boolean( has_outstanding = fields.Boolean(
string='Paiements en circulation', string='Paiements en circulation',
compute='_compute_has_outstanding') compute='_compute_has_outstanding', store=True
)
# ------------------------------------------------------ # ------------------------------------------------------
# Compute # Compute
...@@ -310,13 +311,17 @@ class Bordereau(models.Model): ...@@ -310,13 +311,17 @@ class Bordereau(models.Model):
else: else:
bordereau.is_liasse_previ = False bordereau.is_liasse_previ = False
@api.depends('invoice_ids.residual')
@api.multi @api.multi
def _compute_has_outstanding(self): def _compute_has_outstanding(self):
for r in self: for r in self:
if r.invoice_ids:
if r.invoice_ids.filtered(lambda i: i.has_outstanding is True): if r.invoice_ids.filtered(lambda i: i.has_outstanding is True):
r.has_outstanding = True r.has_outstanding = True
else: else:
r.has_outstanding = False r.has_outstanding = False
else:
r.has_outstanding = False
@api.multi @api.multi
def _compute_details(self): def _compute_details(self):
...@@ -331,7 +336,8 @@ class Bordereau(models.Model): ...@@ -331,7 +336,8 @@ class Bordereau(models.Model):
+ str(contrib.get('type_contribution_id')[1]) + str(contrib.get('type_contribution_id')[1])
+ '</td><td style="width: 100%;">' + '</td><td style="width: 100%;">'
+ str( + str(
contrib.get('amount_total_signed')) + ' €</td>') contrib.get('amount_total_signed')) +
' €</td></tr>')
detail += "</table><table class='o_group o_inner_group'>" detail += "</table><table class='o_group o_inner_group'>"
for i in range(1, 5): for i in range(1, 5):
amount_echeance = sum(self.invoice_ids.filtered( amount_echeance = sum(self.invoice_ids.filtered(
...@@ -340,7 +346,7 @@ class Bordereau(models.Model): ...@@ -340,7 +346,7 @@ class Bordereau(models.Model):
detail += '<tr><td class="o_td_label font-weight-bold">' \ detail += '<tr><td class="o_td_label font-weight-bold">' \
+ 'Trimestre ' + str(i) \ + 'Trimestre ' + str(i) \
+ '</td><td style="width: 100%;">' \ + '</td><td style="width: 100%;">' \
+ str(amount_echeance) + ' €</td>' + str(amount_echeance) + ' €</td></tr>'
detail += '</table>' detail += '</table>'
r.details = detail r.details = detail
......
...@@ -197,6 +197,8 @@ ...@@ -197,6 +197,8 @@
domain="[('state', '=', 'validated')]"/> domain="[('state', '=', 'validated')]"/>
<filter name="state_paid" string="Payé" <filter name="state_paid" string="Payé"
domain="[('state', '=', 'paid')]"/> domain="[('state', '=', 'paid')]"/>
<filter name="has_outstanding" string="Paiements en cours"
domain="[('has_outstanding', '=', True)]"/>
<separator/> <separator/>
<filter name="current_year" string="Campagne année en cours" <filter name="current_year" string="Campagne année en cours"
domain="[('year', '=', (context_today()).strftime('%Y'))]"/> domain="[('year', '=', (context_today()).strftime('%Y'))]"/>
......
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