diff --git a/report/report_scop_bordereau.xml b/report/report_scop_bordereau.xml index fc504bd551e1ad53ec4648553b773142b2404e5a..2457b564f0b6b858118cb91f5c5c1898611bb337 100644 --- a/report/report_scop_bordereau.xml +++ b/report/report_scop_bordereau.xml @@ -46,15 +46,15 @@ <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 + <t t-if="o.year_liasse">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/> + <span t-esc="str(o.year_liasse)" /><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}" />. + Assiette base <span t-field="o.type_assiette" /> : <span t-field="o.montant_assiette" t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}" />. </p> <p> <t t-set="amount_line" t-value="o.get_contribution_type()" /> diff --git a/report/report_scop_bordereau_payments.xml b/report/report_scop_bordereau_payments.xml index ef314818c92dbfc42c6b7c18b8e2043360fd844b..fd2a32c25484776f7baa7ab25030d8ab5edc7cfd 100644 --- a/report/report_scop_bordereau_payments.xml +++ b/report/report_scop_bordereau_payments.xml @@ -37,15 +37,15 @@ <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 + <t t-if="o.year_liasse">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/> + <span t-esc="str(o.year_liasse)" /><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}" />. + Assiette base <span t-field="o.type_assiette" /> : <span t-field="o.montant_assiette" t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}" />. </p> <p> <t t-set="amount_line" t-value="o.get_contribution_type()" /> diff --git a/wizard/scop_bordereau_refund_wizard.xml b/wizard/scop_bordereau_refund_wizard.xml index b44e8789319270dda5e5f399d738f0266c9329a4..08e81043940e9e6562fa7518aa3cb2d8f9ba572c 100644 --- a/wizard/scop_bordereau_refund_wizard.xml +++ b/wizard/scop_bordereau_refund_wizard.xml @@ -10,7 +10,7 @@ <field name="arch" type="xml"> <form string="Générer un avoir"> <sheet> - <group string="Nouveaux calculs"> + <group> <field name="date_refund"/> <separator/> <field name="amount_refund"/>