Skip to content
Extraits de code Groupes Projets
Valider d00d5a68 rédigé par Hervé Silvant - CGScop's avatar Hervé Silvant - CGScop
Parcourir les fichiers

Ajout d'un champ "Justificatifs" pour l'UR Opm

parent bb8f0542
Branches
Aucune étiquette associée trouvée
1 requête de fusion!112 rv saisie calendrier
...@@ -57,6 +57,9 @@ class ScopHrTimesheet(models.Model): ...@@ -57,6 +57,9 @@ class ScopHrTimesheet(models.Model):
string="Nb conventions régionales", string="Nb conventions régionales",
compute="_compute_ur_system_nb") compute="_compute_ur_system_nb")
is_present = fields.Boolean("Présentiel") is_present = fields.Boolean("Présentiel")
justificatifs = fields.Char(
string="Justificatifs",
required=False)
# ------------------------------------------------------ # ------------------------------------------------------
# Compute Functions # Compute Functions
......
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
<field name="name"/> <field name="name"/>
<field name="unit_amount" widget="float_time" /> <field name="unit_amount" widget="float_time" />
<field name="ur_financial_system_id" options="{'no_open': True, 'no_create': True}" /> <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> </tree>
</field> </field>
</sheet> </sheet>
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
</xpath> </xpath>
<xpath expr="//filter[@name='groupby_task']" position="replace"> <xpath expr="//filter[@name='groupby_task']" position="replace">
<filter string="Contact" name="groupby_partner" domain="[]" context="{'group_by':'partner_id'}"/> <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>
<xpath expr="//filter[@name='groupby_project']" position="attributes"> <xpath expr="//filter[@name='groupby_project']" position="attributes">
<attribute name="string">Code activité UR</attribute> <attribute name="string">Code activité UR</attribute>
...@@ -51,6 +52,7 @@ ...@@ -51,6 +52,7 @@
<field name="is_present"/> <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_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="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_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_regional_convention_nb" invisible="1"/>
<field name="ur_financial_system_nb" invisible="1"/> <field name="ur_financial_system_nb" invisible="1"/>
...@@ -96,6 +98,7 @@ ...@@ -96,6 +98,7 @@
<field name="ur_financial_system_nb" invisible="1"/> <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', '&lt;', 1)], 'readonly': [('state', 'in', ('submit', 'valid'))]}"/> <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', '&lt;', 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', '&lt;', 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', '&lt;', 1)], 'readonly': [('state', 'in', ('submit', 'valid'))]}"/>
<field name="justificatifs" attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14243)d)]}"/>
<field name="state" /> <field name="state" />
<field name="ur_id" attrs="{'readonly': [('state', 'in', ('submit', 'valid'))]}" groups="cgscop_partner.group_cg_administrator"/> <field name="ur_id" attrs="{'readonly': [('state', 'in', ('submit', 'valid'))]}" groups="cgscop_partner.group_cg_administrator"/>
</field> </field>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter