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
28df6b77
Commit
28df6b77
authored
Jan 30, 2025
by
Yvon Kerdoncuff
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor spacing wording fix
parent
8fdb58dd
Pipeline
#4094
canceled with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
admin.py
members/admin.py
+3
-3
No files found.
members/admin.py
View file @
28df6b77
...
@@ -414,7 +414,7 @@ def update_members_makeups(request):
...
@@ -414,7 +414,7 @@ def update_members_makeups(request):
return
JsonResponse
(
error
,
status
=
400
)
return
JsonResponse
(
error
,
status
=
400
)
if
cm
.
has_state_unsubscribed_gone_or_associated
():
if
cm
.
has_state_unsubscribed_gone_or_associated
():
error
[
"error"
]
=
(
"L'opération de rattrapage a été annulée car le membre ciblé est désinscrit, parti ou"
error
[
"error"
]
=
(
"L'opération de rattrapage a été annulée car le membre ciblé est désinscrit, parti ou"
"associé."
)
"
associé."
)
return
JsonResponse
(
error
,
status
=
400
)
return
JsonResponse
(
error
,
status
=
400
)
# Save computed data in member_data. It will be useful to update makeups and points.
# Save computed data in member_data. It will be useful to update makeups and points.
member_data
[
"points_diff"
]
=
-
makeup_change_count
member_data
[
"points_diff"
]
=
-
makeup_change_count
...
@@ -629,12 +629,12 @@ def analyse_shift_subscription_request(api, data, partner_id):
...
@@ -629,12 +629,12 @@ def analyse_shift_subscription_request(api, data, partner_id):
res
[
"moving_from_std_to_ftop"
]
=
api
.
search_read
(
'res.partner'
,
c
,
f
)[
0
][
'shift_type'
]
==
'standard'
res
[
"moving_from_std_to_ftop"
]
=
api
.
search_read
(
'res.partner'
,
c
,
f
)[
0
][
'shift_type'
]
==
'standard'
else
:
else
:
raise
MembersAppException
(
"Le service cible n'est ni standard ni ftop."
raise
MembersAppException
(
"Le service cible n'est ni standard ni ftop."
"L'exemption via un service spécial n'est plus supportée par l'application."
)
"
L'exemption via un service spécial n'est plus supportée par l'application."
)
res
[
"target_shift_template_id"
]
=
shift_template_id
res
[
"target_shift_template_id"
]
=
shift_template_id
# Make sure unsubscribe_first data sent by js is still consistent with bdd
# Make sure unsubscribe_first data sent by js is still consistent with bdd
if
data
[
"unsubscribe_first"
]
==
cm
.
has_state_unsubscribed_gone_or_associated
():
if
data
[
"unsubscribe_first"
]
==
cm
.
has_state_unsubscribed_gone_or_associated
():
raise
MembersAppException
(
"Les informations affichées sont périmées."
raise
MembersAppException
(
"Les informations affichées sont périmées."
"Veuillez recharger la page avant de poursuivre."
)
"
Veuillez recharger la page avant de poursuivre."
)
if
data
[
"unsubscribe_first"
]:
if
data
[
"unsubscribe_first"
]:
res
[
"makeups_reg_on_target_shift_template"
]
=
cm
.
get_makeup_registrations_ids_on_shift_template
(
res
[
"makeups_reg_on_target_shift_template"
]
=
cm
.
get_makeup_registrations_ids_on_shift_template
(
res
[
"target_shift_template_id"
]
res
[
"target_shift_template_id"
]
...
...
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