diff --git a/models/scop_liasse_fiscale.py b/models/scop_liasse_fiscale.py index 0d04c12f2fd8965c1edc3acdb08873ccaa01042f..5bd8cd32cb3cfc1fec8ca42ee4815cd3236c8717 100644 --- a/models/scop_liasse_fiscale.py +++ b/models/scop_liasse_fiscale.py @@ -2950,7 +2950,7 @@ class ScopLiasseFiscale(models.Model): or r.L2052_FV or r.L2052_FX or r.L2052_FO - ): + ) and not self._context.get("is_forecast"): res1 = ( r.L2052_FW - r.L2058_YT @@ -3357,6 +3357,14 @@ class ScopLiasseFiscale(models.Model): else: return False + # ------------------------------------------------------ + # Onchange fields + # ------------------------------------------------------ + @api.onchange("L2050_DCLO") + def _onchange_L2050_DCLO(self): + if self.L2050_DCLO: + self.year = self.L2050_DCLO.year + # ------------------------------------------------------ # Button # ------------------------------------------------------ diff --git a/views/res_partner.xml b/views/res_partner.xml index 24115e8bc97101d443be9efa58bee4dc5ab8ea1f..fcffbd4952622df6f0144fc2d88107d1d72d0433 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -18,7 +18,7 @@ <page name='scop_liasse_fiscale' string="Liasses Fiscales" - attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', 'not in', ('5_cg', '6_suivi'))]}" + attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', 'not in', ('4_suivi'))]}" > <field name="liasse_fiscale_ids" mode="tree"> <tree diff --git a/views/scop_liasse_fiscale_views.xml b/views/scop_liasse_fiscale_views.xml index 94b6647f8c10b953d1f9b582bddc3e626ffb31aa..3a4a88634fdfad15efc1df93d5006db2a4b340a4 100644 --- a/views/scop_liasse_fiscale_views.xml +++ b/views/scop_liasse_fiscale_views.xml @@ -143,11 +143,14 @@ readonly="1" /> </h3> + <div class="alert alert-warning" role="alert"> + Les données sont à intégrer en Euros. + </div> <group> <group string="Données financières"> <field name="ur_id" invisible="1" /> <field name="L2052_FL" readonly="0" required="1" /> - <field name="av_cg" readonly="0" required="1" /> + <field name="av_cg" string="VA" readonly="0" required="1" /> <field name="L2052_FY" string="Masse Salariale" @@ -15637,6 +15640,7 @@ <field name="res_model">scop.liasse.fiscale</field> <field name="view_mode">form</field> <field name="view_id" ref="scop_liasse_fiscale_previsionnelle_form_view" /> + <field name="context">{"is_forecast": True}</field> <field name="target">current</field> </record>