Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
C
cgscop_partner
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_partner
Validations
d96d216b
Valider
d96d216b
rédigé
Il y a 3 ans
par
jordan
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
[fix] use current membership_number if exists for new membership
parent
125fcad5
Branches
Branches contenant la validation
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
1
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
1 fichier modifié
models/res_partner.py
+8
-12
8 ajouts, 12 suppressions
models/res_partner.py
avec
8 ajouts
et
12 suppressions
models/res_partner.py
+
8
−
12
Voir le fichier @
d96d216b
...
...
@@ -91,12 +91,10 @@ class ScopPartner(models.Model):
store
=
True
,
)
member_number
=
fields
.
Char
(
"
No adhérent (texte)
"
,
compute
=
"
_compute_membership
"
,
store
=
True
"
No adhérent (texte)
"
,
compute
=
"
_compute_membership
_number
"
,
store
=
True
)
member_number_int
=
fields
.
Integer
(
"
No adhérent
"
,
compute
=
"
_compute_membership_int
"
,
store
=
True
,
group_operator
=
""
,
)
member_start_stat
=
fields
.
Date
(
...
...
@@ -974,11 +972,9 @@ class ScopPartner(models.Model):
if
len
(
partner
.
action_rse_ids
)
!=
0
:
partner
.
is_rse
=
True
# TODO: déplacer dans adhésions ? cotisations?
@api.depends
(
"
membership_period_ids
"
,
"
membership_period_ids.end_reason_id
"
,
"
membership_period_ids.number
"
,
"
membership_period_ids.end
"
,
)
def
_compute_membership
(
self
):
...
...
@@ -988,24 +984,24 @@ class ScopPartner(models.Model):
last_membership_period
=
self
.
env
[
"
scop.membership.period
"
].
search
(
[(
"
partner_id
"
,
"
=
"
,
partner
.
id
),
(
"
type_id
"
,
"
=
"
,
type_cg
)],
limit
=
1
,
order
=
"
start desc
"
,
order
=
"
start
,id
desc
"
,
)
if
last_membership_period
and
not
last_membership_period
.
end
:
partner
.
membership_status
=
"
member
"
partner
.
member_number
=
last_membership_period
.
number
partner
.
member_start_stat
=
last_membership_period
.
start_stat
partner
.
member_start
=
last_membership_period
.
start
elif
last_membership_period
and
last_membership_period
.
end_reason_id
:
partner
.
membership_status
=
"
out
"
partner
.
member_number
=
last_membership_period
.
number
else
:
partner
.
membership_status
=
"
not_member
"
@api.depends
(
"
member_number
"
)
def
_compute_membership_
int
(
self
):
@api.depends
(
"
member_number
_int
"
)
def
_compute_membership_
number
(
self
):
for
partner
in
self
:
if
partner
.
member_number
:
partner
.
member_number_int
=
int
(
partner
.
member_number
)
if
partner
.
member_number_int
:
partner
.
member_number
=
str
(
partner
.
member_number_int
)
else
:
partner
.
member_number
=
False
@api.depends
(
"
membership_period_ids
"
,
"
membership_period_ids.end
"
)
def
_compute_federation
(
self
):
...
...
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