Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
C
cgscop_invoice_idf
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_invoice_idf
Validations
abff0504
Valider
abff0504
rédigé
Il y a 4 ans
par
jordan
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
[fix] compute_state is not dependent of lettrage
parent
901bfdb6
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
2
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
2 fichiers modifiés
models/scop_cotisations_idf.py
+23
-26
23 ajouts, 26 suppressions
models/scop_cotisations_idf.py
models/scop_invoice_idf.py
+22
-26
22 ajouts, 26 suppressions
models/scop_invoice_idf.py
avec
45 ajouts
et
52 suppressions
models/scop_cotisations_idf.py
+
23
−
26
Voir le fichier @
abff0504
...
...
@@ -95,11 +95,8 @@ class ScopCotisationsIDF(models.Model):
"""
partners
=
set
(
self
.
mapped
(
'
partner_id
'
))
years
=
set
(
self
.
mapped
(
'
year
'
))
letters
=
set
(
self
.
mapped
(
'
lettrage
'
))
for
year
in
years
:
for
partner
in
partners
:
for
letter
in
letters
:
# Group lines by partner, year, letter
invoice_lines
=
self
.
search
([
[
'
year
'
,
'
=
'
,
year
],
[
'
partner_id
'
,
'
=
'
,
partner
.
id
],
...
...
@@ -113,15 +110,15 @@ class ScopCotisationsIDF(models.Model):
for
invoice
in
invoices
:
if
invoice
.
amount_residual
>
0
:
invoice
.
state
=
'
awaiting_payments
'
for
r
in
invoice
.
payment
_or_refund
_ids
:
for
r
in
invoice
.
payment
s
_ids
:
r
.
state
=
'
awaiting_payments
'
elif
invoice
.
amount_residual
<
0
:
invoice
.
state
=
'
overpaid
'
for
r
in
invoice
.
payment
_or_refund
_ids
:
for
r
in
invoice
.
payment
s
_ids
:
r
.
state
=
'
overpaid
'
else
:
invoice
.
state
=
'
paid
'
for
r
in
invoice
.
payment
_or_refund
_ids
:
for
r
in
invoice
.
payment
s
_ids
:
r
.
state
=
'
paid
'
@api.multi
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
models/scop_invoice_idf.py
+
22
−
26
Voir le fichier @
abff0504
...
...
@@ -90,15 +90,11 @@ class ScopInvoiceIDF(models.Model):
"""
partners
=
set
(
self
.
mapped
(
'
partner_id
'
))
years
=
set
(
self
.
mapped
(
'
year
'
))
letters
=
set
(
self
.
mapped
(
'
lettrage
'
))
for
year
in
years
:
for
partner
in
partners
:
for
letter
in
letters
:
# Group lines by partner, year, letter
invoice_lines
=
self
.
search
([
[
'
year
'
,
'
=
'
,
year
],
[
'
partner_id
'
,
'
=
'
,
partner
.
id
],
[
'
lettrage
'
,
'
=
'
,
letter
]])
[
'
partner_id
'
,
'
=
'
,
partner
.
id
],
])
invoices
=
invoice_lines
.
filtered
(
lambda
l
:
l
.
type
==
'
inv
'
)
if
not
invoices
:
...
...
@@ -108,15 +104,15 @@ class ScopInvoiceIDF(models.Model):
for
invoice
in
invoices
:
if
invoice
.
amount_residual
>
0
:
invoice
.
state
=
'
awaiting_payments
'
for
r
in
invoice
.
payment
_or_refund
_ids
:
for
r
in
invoice
.
payment
s
_ids
:
r
.
state
=
'
awaiting_payments
'
elif
invoice
.
amount_residual
<
0
:
invoice
.
state
=
'
overpaid
'
for
r
in
invoice
.
payment
_or_refund
_ids
:
for
r
in
invoice
.
payment
s
_ids
:
r
.
state
=
'
overpaid
'
else
:
invoice
.
state
=
'
paid
'
for
r
in
invoice
.
payment
_or_refund
_ids
:
for
r
in
invoice
.
payment
s
_ids
:
r
.
state
=
'
paid
'
@api.multi
...
...
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