Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
third-party
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cooperatic-foodcoops
third-party
Commits
bf5f0a70
Commit
bf5f0a70
authored
a year ago
by
Yvon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
take into account makeups to come in computation of target point in update_members_makeups_core
parent
d6828972
dev_cooperatic
…
#5673_bug_calendrier_echange_service
5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages
5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites
6286_bug_encaissement_souscription_cheque_espece
6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template
6832--certaines-absences-engendrent-une-erreur
7723-7559-change-purchase-order-workflow-django-side
7731-third-party-side-brinks-pos-export-not-working
7747-inventaire-par-article
7800-make-test-solution-work
7819-prevent-adding-product-already-in-order
7848-cannot-validate-qty-with-decimal-on-kg-product
7918_bug_quantites_stade_demande_prix
adpatation_chouette
assistance_import_article
coop_dev_necessitant_modules_bdm_odoo_modifies
correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif
export_capital_detenu
fix_bug_process_picking
graoucoop_prod
graoucoop_tmp
impression_etiquettes_rayons
integration_lien_precommandes_dans_espace_membre
lacagette_prod
local_branch
migration-v12
pour_graoucoop_prod
pour_version_prod_cagette
refonte_espace_membre_sc
supercafoutch_prod
supercafoutch_20250120_151258
supercafoutch_20250120_150340
supercafoutch_20240909_080630
supercafoutch_20240609_115709
supercafoutch_20240212_082431
supercafoutch_20240107_181851
migration-v12-tag
lacagette_20240310_074751
lacagette_20240107_122554
lacagette_20240107_120916
graoucoop_20240609_122614
cagette_testtag
1 merge request
!249
5015 prevention decalage compteur rattrapage et points
Pipeline
#3051
failed with stage
in 1 minute 5 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
admin.py
members/admin.py
+4
-2
No files found.
members/admin.py
View file @
bf5f0a70
...
...
@@ -399,8 +399,10 @@ def update_members_makeups_core(members_data, res):
# Update member standard points, for standard members only
if
member_data
[
"member_shift_type"
]
==
"standard"
:
# Set points to minus the number of makeups to do (limited to -2)
target_points
=
-
int
(
member_data
[
"target_makeups_nb"
])
# Set points to minus the number of makeups to do + the makeups to come (limited to -2)
cs
=
CagetteShift
()
shift_data
=
cs
.
get_shift_partner
(
int
(
member_data
[
"member_id"
]))
target_points
=
-
int
(
member_data
[
"target_makeups_nb"
])
-
sum
(
1
for
value
in
shift_data
if
value
[
'is_makeup'
])
if
(
target_points
<
-
2
):
target_points
=
-
2
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment