From 25b597deef276f959ceaebb1d733a8b5f9985af6 Mon Sep 17 00:00:00 2001 From: jordan <jordan@le-filament.com> Date: Wed, 26 May 2021 16:24:57 +0200 Subject: [PATCH] =?UTF-8?q?[update]=20add=20field=20type=5Fliasse=5Ffiscal?= =?UTF-8?q?e=20to=20display=20'Pr=C3=A9visionnelle'=20instead=20of=20year?= =?UTF-8?q?=20in=20report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/scop_bordereau_cg.py | 17 +++++++++++++++++ report/report_scop_bordereau.xml | 9 ++++++++- report/report_scop_bordereau_payments.xml | 11 +++++++++-- views/scop_bordereau_cg.xml | 1 + 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/models/scop_bordereau_cg.py b/models/scop_bordereau_cg.py index 79b0091..8edbe72 100644 --- a/models/scop_bordereau_cg.py +++ b/models/scop_bordereau_cg.py @@ -48,6 +48,13 @@ class Bordereau(models.Model): string='Liasse fiscale de référence', readonly=True, track_visibility='onchange') + type_liasse_fiscale = fields.Many2one( + comodel_name='scop.liasse.fiscale.type', + string='Type de liasse', + related='liasse_fiscale_id.type_id') + is_liasse_previ = fields.Boolean( + 'Est une liasse prévisionnelle', + compute='_compute_is_liasse_previ') dureeExercice = fields.Integer( string='Durée de l’exercice', related='liasse_fiscale_id.dureeExercice', @@ -340,6 +347,16 @@ class Bordereau(models.Model): else: self.move_reconciled = True + @api.multi + def _compute_is_liasse_previ(self): + liasse_type_previ = self.env.ref( + 'cgscop_liste_ministere.liasse_type_1') + for bordereau in self: + if bordereau.type_liasse_fiscale.id == liasse_type_previ.id: + bordereau.is_liasse_previ = True + else: + bordereau.is_liasse_previ = False + # ------------------------------------------------------ # Button functions # ------------------------------------------------------ diff --git a/report/report_scop_bordereau.xml b/report/report_scop_bordereau.xml index 5841f50..fc504bd 100644 --- a/report/report_scop_bordereau.xml +++ b/report/report_scop_bordereau.xml @@ -46,7 +46,14 @@ <div></div> <h5 class="mt8" style="font-weight: 600;">Cotisations annuelles</h5> <p style="font-style: italic; font-size: 13px;"> - <t t-if="o.year_liasse_retenue">Calcul basé sur la liasse fiscale <span t-esc="str(o.year_liasse_retenue)" /><br/></t> + <t t-if="o.year_liasse_retenue">Calcul basé sur la liasse fiscale + <t t-if="o.is_liasse_previ"> + <span>Prévisionnelle</span><br/> + </t> + <t t-else=""> + <span t-esc="str(o.year_liasse_retenue)" /><br/> + </t> + </t> Assiette base <span t-field="o.type_assiette_retenu" /> : <span t-field="o.montant_assiette" t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}" />. </p> <p> diff --git a/report/report_scop_bordereau_payments.xml b/report/report_scop_bordereau_payments.xml index 401f46f..d5e54e2 100644 --- a/report/report_scop_bordereau_payments.xml +++ b/report/report_scop_bordereau_payments.xml @@ -37,7 +37,14 @@ <div></div> <h5 class="mt8" style="font-weight: 600;">Cotisations annuelles</h5> <p style="font-style: italic; font-size: 13px;"> - <t t-if="o.year_liasse_retenue">Calcul basé sur la liasse fiscale <span t-esc="str(o.year_liasse_retenue)" /><br/></t> + <t t-if="o.year_liasse_retenue">Calcul basé sur la liasse fiscale + <t t-if="o.is_liasse_previ"> + <span>Prévisionnelle</span><br/> + </t> + <t t-else=""> + <span t-esc="str(o.year_liasse_retenue)" /><br/> + </t> + </t> Assiette base <span t-field="o.type_assiette_retenu" /> : <span t-field="o.montant_assiette" t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}" />. </p> <p> @@ -77,7 +84,7 @@ <td class="text-right" style="border: none; background: inherit; color: inherit;"><t t-esc="line.get('debit') - line.get('amount_residual')" t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}"/></td> </tr> </table> - <table class="table table-sm table-striped" style="border: none;"> + <table class="table table-sm table-striped" style="border: none;"> <tr> <th>Montant dû</th> <th class="text-right">Total appelé</th> diff --git a/views/scop_bordereau_cg.xml b/views/scop_bordereau_cg.xml index 103c944..12be2fd 100644 --- a/views/scop_bordereau_cg.xml +++ b/views/scop_bordereau_cg.xml @@ -56,6 +56,7 @@ <field name="payment_term_id" attrs="{'readonly':[('state','!=','new')]}"/> <field name="payment_mode_id" attrs="{'readonly':[('state','!=','new')]}"/> <field name="liasse_fiscale_id"/> + <field name="type_liasse_fiscale" options="{'no_open': True}"/> </group> <group> <field name="year_liasse_retenue" attrs="{'readonly':[('state','!=','new')]}"/> -- GitLab