diff --git a/models/hr_timesheet.py b/models/hr_timesheet.py index b0bcadd342b9f7f5a88a270632c634f4347ffc55..759e2c877a3bd8a0e3050dc5879efc2a68f1eff6 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 5d16dcc6c6e9afa4004a15be3713142ec05b16df..2455540235f76ab0b514619370188699cf46a449 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 ead01a52581cf3a744eab7eb7dab7bdddb10e77e..11a4bb7dd5551b7a448cca7f37c7d68f64ec7ea9 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>