From 6383c6de59b4266d66e3a1b4aa8aa89b932c605b Mon Sep 17 00:00:00 2001
From: jordan <jordan@le-filament.com>
Date: Mon, 13 Dec 2021 19:04:57 +0100
Subject: [PATCH] [update] add echeancier on bordereau
---
models/scop_bordereau_cg.py | 16 ++++++++++------
views/scop_bordereau_cg.xml | 4 +---
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/models/scop_bordereau_cg.py b/models/scop_bordereau_cg.py
index 69db362..0608d79 100644
--- a/models/scop_bordereau_cg.py
+++ b/models/scop_bordereau_cg.py
@@ -350,12 +350,16 @@ class Bordereau(models.Model):
+ str(contrib.get('type_contribution_id')[1])
+ '</td><td style="width: 100%;">'
+ str(
- contrib.get('amount_total_signed')) + '€</td>')
- amount_echeance = self.amount_total_cotiz / self.nb_quarter
- detail += '<tr><td class="o_td_label font-weight-bold">' \
- + 'Montant échéance' \
- + '</td><td style="width: 100%;">' \
- + str(amount_echeance) + '€</td>'
+ contrib.get('amount_total_signed')) + ' €</td>')
+ detail += "</table><table class='o_group o_inner_group'>"
+ for i in range(1, 5):
+ amount_echeance = sum(self.invoice_ids.filtered(
+ lambda inv: inv.cotiz_quarter == i
+ ).mapped('amount_total_signed'))
+ detail += '<tr><td class="o_td_label font-weight-bold">' \
+ + 'Trimestre ' + str(i) \
+ + '</td><td style="width: 100%;">' \
+ + str(amount_echeance) + ' €</td>'
detail += '</table>'
r.details = detail
diff --git a/views/scop_bordereau_cg.xml b/views/scop_bordereau_cg.xml
index 089da6e..6745dc9 100644
--- a/views/scop_bordereau_cg.xml
+++ b/views/scop_bordereau_cg.xml
@@ -98,9 +98,7 @@
<field name="type_assiette" attrs="{'invisible': [('liasse_fiscale_id', '=', False)]}"/>
<field name="montant_assiette" attrs="{'invisible': [('liasse_fiscale_id', '=', False)]}"/>
<field name="amount_total_cotiz"/>
- <div>
- <field name="details"/>
- </div>
+ <field name="details" nolabel="1"/>
</group>
</group>
--
GitLab