Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
C
cgscop_timesheet
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse du dépôt
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Le Filament
Confédération Générale des SCOP
cgscop_timesheet
Validations
d00d5a68
Valider
d00d5a68
rédigé
Il y a 4 ans
par
Hervé Silvant - CGScop
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
Ajout d'un champ "Justificatifs" pour l'UR Opm
parent
bb8f0542
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion
!3
12 rv justificatifs opm
Modifications
3
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
3 fichiers modifiés
models/hr_timesheet.py
+3
-0
3 ajouts, 0 suppression
models/hr_timesheet.py
views/cgscop_timesheet_sheet.xml
+1
-0
1 ajout, 0 suppression
views/cgscop_timesheet_sheet.xml
views/hr_timesheet.xml
+3
-0
3 ajouts, 0 suppression
views/hr_timesheet.xml
avec
7 ajouts
et
0 suppression
models/hr_timesheet.py
+
3
−
0
Voir le fichier @
d00d5a68
...
@@ -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
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
views/cgscop_timesheet_sheet.xml
+
1
−
0
Voir le fichier @
d00d5a68
...
@@ -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>
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
views/hr_timesheet.xml
+
3
−
0
Voir le fichier @
d00d5a68
...
@@ -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', '<', 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', '<', 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=
"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=
"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>
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter