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
3
Merge Requests
3
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
7ce1951e
Commit
7ce1951e
authored
3 years ago
by
Félicie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
column point added
parent
5cfdcae6
dev_cooperatic
…
#5673_bug_calendrier_echange_service
3832-makeups-and-member-status-update
4081
4444_improve_presence_recording
4709
4778-reception-dont-get-finished-orders
4809-remove-shelf-value-col-to-reduce-server-load
4880-rapports-reception-faux
4950-douchage-appli-reception
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
adaptation_supercafoutch
adaptation_supercoop
adaptation_supercoop_supercafoutch
adpatation_chouette
assistance_import_article
coop_dev_necessitant_modules_bdm_odoo_modifies
correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif
dev_principale
export_capital_detenu
fix_bug_process_picking
fusion_custom_graoucoop
graoucoop_backup
graoucoop_prod
graoucoop_tmp
hot_fix_shelf_labels_auto_print
impression_etiquettes_rayons
integration_lien_precommandes_dans_espace_membre
lacagette_prod
local_branch
meal-voucher-and-label-printer-software-bug
migration-v12
pour_graoucoop_prod
pour_version_prod_cagette
refonte_espace_membre_sc
retouches_tickets_supercoop
sc-setup-stock-app
supercafoutch-preprod
supercafoutch-prod-20221003
supercafoutch_prod
ticket_4146
supercafoutch_20250120_151258
supercafoutch_20250120_150340
supercafoutch_20240909_080630
supercafoutch_20240609_115709
supercafoutch_20240212_082431
supercafoutch_20240107_181851
supercafoutch_prod_until_240107
supercafoutch-prod-20221003
supercafoutch-230911
supercafoutch-230824
supercafoutch-230823
supercafoutch-230823-the-true-one
migration-v12-tag
lacagette_20240310_074751
lacagette_20240107_122554
lacagette_20240107_120916
graoucoop_20240609_122614
cagette_testtag
cagette-230814
cagette-230630
2 merge requests
!142
2387 member points
,
!164
Intégration des dév. Cooperatic pour la Cagette
Pipeline
#1875
passed with stage
in 1 minute 31 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletions
+13
-1
models.py
members/models.py
+1
-1
manage_makeups.js
members/static/js/admin/manage_makeups.js
+12
-0
No files found.
members/models.py
View file @
7ce1951e
...
@@ -1089,7 +1089,7 @@ class CagetteMembers(models.Model):
...
@@ -1089,7 +1089,7 @@ class CagetteMembers(models.Model):
def
get_makeups_members
():
def
get_makeups_members
():
api
=
OdooAPI
()
api
=
OdooAPI
()
cond
=
[[
'makeups_to_do'
,
'>'
,
0
]]
cond
=
[[
'makeups_to_do'
,
'>'
,
0
]]
fields
=
[
'id'
,
'name'
,
'
makeups_to_do'
,
'shift_type
'
]
fields
=
[
'id'
,
'name'
,
'
display_std_points'
,
'display_ftop_points'
,
'makeups_to_do
'
]
res
=
api
.
search_read
(
'res.partner'
,
cond
,
fields
)
res
=
api
.
search_read
(
'res.partner'
,
cond
,
fields
)
return
res
return
res
...
...
This diff is collapsed.
Click to expand it.
members/static/js/admin/manage_makeups.js
View file @
7ce1951e
...
@@ -69,6 +69,18 @@ function display_makeups_members() {
...
@@ -69,6 +69,18 @@ function display_makeups_members() {
title
:
"Nom"
title
:
"Nom"
},
},
{
{
data
:
"display_std_points"
,
title
:
"Nb points service"
,
className
:
"dt-body-center"
,
width
:
"10%"
,
},
{
data
:
"display_ftop_points"
,
title
:
"Nb points comité"
,
className
:
"dt-body-center"
,
width
:
"10%"
,
},
{
data
:
"makeups_to_do"
,
data
:
"makeups_to_do"
,
title
:
"Nb rattrapages"
,
title
:
"Nb rattrapages"
,
className
:
"dt-body-center"
,
className
:
"dt-body-center"
,
...
...
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