From d00d5a686f107c47dd1078af77c99bed9c5db5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Silvant?= <hsilvant@scop.coop> Date: Tue, 4 May 2021 17:22:46 +0200 Subject: [PATCH] Ajout d'un champ "Justificatifs" pour l'UR Opm --- models/hr_timesheet.py | 3 +++ views/cgscop_timesheet_sheet.xml | 1 + views/hr_timesheet.xml | 3 +++ 3 files changed, 7 insertions(+) diff --git a/models/hr_timesheet.py b/models/hr_timesheet.py index b0bcadd..759e2c8 100644 --- a/models/hr_timesheet.py +++ b/models/hr_timesheet.py @@ -57,6 +57,9 @@ class ScopHrTimesheet(models.Model): string="Nb conventions régionales", compute="_compute_ur_system_nb") is_present = fields.Boolean("Présentiel") + justificatifs = fields.Char( + string="Justificatifs", + required=False) # ------------------------------------------------------ # Compute Functions diff --git a/views/cgscop_timesheet_sheet.xml b/views/cgscop_timesheet_sheet.xml index 5d16dcc..2455540 100644 --- a/views/cgscop_timesheet_sheet.xml +++ b/views/cgscop_timesheet_sheet.xml @@ -65,6 +65,7 @@ <field name="name"/> <field name="unit_amount" widget="float_time" /> <field name="ur_financial_system_id" options="{'no_open': True, 'no_create': True}" /> + <field name="justificatifs" attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14243)d)]}"/> </tree> </field> </sheet> diff --git a/views/hr_timesheet.xml b/views/hr_timesheet.xml index ead01a5..11a4bb7 100644 --- a/views/hr_timesheet.xml +++ b/views/hr_timesheet.xml @@ -29,6 +29,7 @@ </xpath> <xpath expr="//filter[@name='groupby_task']" position="replace"> <filter string="Contact" name="groupby_partner" domain="[]" context="{'group_by':'partner_id'}"/> + <filter string="Dispositif financier" name="groupby_financial_system" domain="[]" context="{'group_by':'ur_financial_system_id'}"/> </xpath> <xpath expr="//filter[@name='groupby_project']" position="attributes"> <attribute name="string">Code activité UR</attribute> @@ -51,6 +52,7 @@ <field name="is_present"/> <field name="ur_financial_system_id" options="{'no_open': True, 'no_create': True}" attrs="{'required':[('ur_financial_system_nb', '>', 0)], 'invisible':[('ur_financial_system_nb', '=', 0)]}"/> <field name="ur_regional_convention_id" options="{'no_open': True, 'no_create': True}" attrs="{'required':[('ur_regional_convention_nb', '>', 0)], 'invisible':[('ur_regional_convention_nb', '=', 0)]}"/> + <field name="justificatifs" attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14243)d)]}"/> <field name="ur_id" options="{'no_open': True, 'no_create': True}" groups="cgscop_partner.group_cg_administrator"/> <field name="ur_regional_convention_nb" invisible="1"/> <field name="ur_financial_system_nb" invisible="1"/> @@ -96,6 +98,7 @@ <field name="ur_financial_system_nb" invisible="1"/> <field name="ur_financial_system_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('ur_financial_system_nb', '>', 0)], 'invisible': [('ur_financial_system_nb', '<', 1)], 'readonly': [('state', 'in', ('submit', 'valid'))]}"/> <field name="ur_regional_convention_id" options="{'no_open': True, 'no_create': True}" attrs="{'required':[('ur_regional_convention_nb', '>', 0)], 'invisible':[('ur_regional_convention_nb', '<', 1)], 'readonly': [('state', 'in', ('submit', 'valid'))]}"/> + <field name="justificatifs" attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14243)d)]}"/> <field name="state" /> <field name="ur_id" attrs="{'readonly': [('state', 'in', ('submit', 'valid'))]}" groups="cgscop_partner.group_cg_administrator"/> </field> -- GitLab