Skip to content
Extraits de code Groupes Projets
Valider 4a0d513f rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

Merge branch '12-RV-Justificatifs-Opm' into '12.0'

12 rv justificatifs opm

See merge request !3
parents 529f4076 cce72b22
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!112 rv saisie calendrier
......@@ -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
......
......@@ -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>
......
......@@ -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', '&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="ur_id" attrs="{'readonly': [('state', 'in', ('submit', 'valid'))]}" groups="cgscop_partner.group_cg_administrator"/>
</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