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
8ea94e46
An error occurred while fetching merge requests data.
Commit
8ea94e46
authored
2 years ago
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
create new config param to display comites button in bdm admin, manage shift templates
parent
f039d92a
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
7848-cannot-validate-qty-with-decimal-on-kg-product
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
Pipeline
#2135
passed with stage
in 1 minute 29 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletions
+11
-1
config_lacagette.py
coops_configurations/config_lacagette.py
+3
-0
admin.py
members/admin.py
+1
-1
config.md
outils/config.md
+7
-0
No files found.
coops_configurations/config_lacagette.py
View file @
8ea94e46
...
...
@@ -138,3 +138,6 @@ ORDERS_HELPER_METABASE_URL = "url_meta_base"
USE_NEW_MEMBERS_SPACE
=
True
START_DATE_FOR_SHIFTS_HISTORY
=
"2018-01-01"
AMNISTIE_DATE
=
"2021-11-24 00:00:00"
# BDM Admin
BDM_SHOW_FTOP_BUTTON
=
True
This diff is collapsed.
Click to expand it.
members/admin.py
View file @
8ea94e46
...
...
@@ -347,7 +347,7 @@ def manage_regular_shifts(request):
'max_begin_hour'
:
settings
.
MAX_BEGIN_HOUR
,
'mag_place_string'
:
settings
.
MAG_NAME
,
'open_on_sunday'
:
getattr
(
settings
,
'OPEN_ON_SUNDAY'
,
False
),
'show_ftop_button'
:
getattr
(
settings
,
'SHOW_FTOP_BUTTON'
,
True
),
'show_ftop_button'
:
getattr
(
settings
,
'
BDM_
SHOW_FTOP_BUTTON'
,
True
),
'has_committe_shift'
:
committees_shift_id
is
not
None
,
'ASSOCIATE_MEMBER_SHIFT'
:
getattr
(
settings
,
'ASSOCIATE_MEMBER_SHIFT'
,
''
)
}
...
...
This diff is collapsed.
Click to expand it.
outils/config.md
View file @
8ea94e46
...
...
@@ -385,6 +385,13 @@
-
AMNISTIE_DATE = "2021-11-24 00:00:00"
In members_space history display a special activity about amnistie
### BDM Admin
-
BDM_SHOW_FTOP_BUTTON = True (by default)
If True, in BDM Admin manage shift template, on the calendar when subscribing a partner to a shift, "Volant" button is included
### Miscellious
-
EXPORT_COMPTA_FORMAT = 'Quadratus'
...
...
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