Commits · e5493c3e17001d7d9c6ba8441829a703066c5518 · cooperatic-foodcoops / third-party

09 Jun, 2024 1 commit
- Merge branch 'dev_cooperatic' into 'supercafoutch_prod' · e5493c3e
```
MEP Supercafoutch 9 juin 2024

See merge request !275
```
  Yvon Kerdoncuff authored Jun 09, 2024
  e5493c3e Browse Files
07 Jun, 2024 1 commit
- activate phone pattern for lacagette as well · 8da39cf9
  Yvon authored Jun 07, 2024
  
  8da39cf9 Browse Files
05 Jun, 2024 1 commit
- Ajout template export_capital.html oublié dans précédent push · 7dcd418c
  François COLOMBIER authored Jun 05, 2024
  
  7dcd418c Browse Files
04 Jun, 2024 3 commits
- Merge branch 'export_capital_detenu' into 'dev_cooperatic' · edd7cfa1
```
Ajout fonctionnalité Export du capital détenu à une date donnée

See merge request !274
```
  Administrator authored Jun 04, 2024
  edd7cfa1 Browse Files
- Merge branch '6286_bug_encaissement_souscription_cheque_espece' into 'dev_cooperatic' · b17bcabd
```
#6286: Correctifs processus enregistrement paiement enveloppe

See merge request !273
```
  Administrator authored Jun 04, 2024
  b17bcabd Browse Files
- Ajout fonctionnalité Export du capital détenu à une date donnée · 282d00cc
  François COLOMBIER authored Jun 04, 2024
  
  282d00cc Browse Files
19 May, 2024 2 commits
- Merge branch '6190-fix-add-social-parts' into 'dev_cooperatic' · 9904fbbe
```
don't fetch associated people for envelops members search

See merge request !272
```
  François C. authored May 19, 2024
  9904fbbe Browse Files
- Adjust condition to retrieve all members who can subsribe shares in envelops search context · 9adac638
  François COLOMBIER authored May 19, 2024
  
  9adac638 Browse Files
06 May, 2024 1 commit
- #6286: Correctifs processus enregistrement paiement enveloppe · 704a0dfb
  François COLOMBIER authored May 06, 2024
  
  704a0dfb Browse Files
02 May, 2024 1 commit
- don't fetch associated people for envelops members search · e08af6b2
  Damien Moulard authored May 02, 2024
  
  e08af6b2 Browse Files
28 Apr, 2024 2 commits
- Revert "Merge branch '6190-CAGETTE-sur-brinks-cacher-le-doublon-user-rattache-non-coop'…" · 66e8a55a
```
This reverts merge request !266
```
  Yvon Kerdoncuff authored Apr 28, 2024
  66e8a55a Browse Files
- Revert "Merge branch '6190-fix-variable-used' into 'dev_cooperatic'" · a9dc558e
```
This reverts merge request !267
```
  Yvon Kerdoncuff authored Apr 28, 2024
  a9dc558e Browse Files
27 Apr, 2024 2 commits
- Merge branch 'hot_fix_member_without_shif_template' into 'dev_cooperatic' · 64d51055
```
Hot fix member without shif template

See merge request !271
```
  François C. authored Apr 27, 2024
  64d51055 Browse Files
- Fix 500 error if a member has not a shif_template id set · cf673b7e
  François C. authored Apr 27, 2024
  
  cf673b7e Browse Files
24 Apr, 2024 4 commits
- Merge branch '6146-SUPERCAFOUTCH-fix-phone-number-matching-pattern' into 'dev_cooperatic' · 396a54e3
```
replace supercafoutch broken phone number matching pattern by one which allows…

See merge request !269
```
  François C. authored Apr 24, 2024
  396a54e3 Browse Files
- Merge branch… · 1d7f56d5
```
Merge branch '6147-SUPERCAFOUTCH-desactiver-la-possibilite-pour-les-deux-binomés-de-venir-sur-le-meme-service' into 'dev_cooperatic'

disable this feature for supercafoutch using parameter

See merge request !270
```
  François C. authored Apr 24, 2024
  1d7f56d5 Browse Files
- Merge branch '6202-SUPERCAFOUTCH-message-lors-de-la-selection-de-creneau' into 'dev_cooperatic' · e9c05e33
```
allow bdm to configure a message that is displayed when a member selects a…

See merge request !268
```
  François C. authored Apr 24, 2024
  e9c05e33 Browse Files
- Merge branch '6090-nb-de-rattrapages-negatifs-le-retour' into 'dev_cooperatic' · 4ebc82f4
```
6090 nb de rattrapages negatifs le retour

See merge request !264
```
  François C. authored Apr 24, 2024
  4ebc82f4 Browse Files
19 Apr, 2024 10 commits
- disable this feature for supercafoutch using parameter · b41407a9
  Yvon authored Apr 19, 2024
  
  b41407a9 Browse Files
- replace supercafoutch broken phone number matching pattern by one which allows… · b0ccb8f0
```
replace supercafoutch broken phone number matching pattern by one which allows foreign phone numbers
```
  Yvon authored Apr 19, 2024
  b0ccb8f0 Browse Files
- allow bdm to configure a message that is displayed when a member selects a… · 074a03f9
```
allow bdm to configure a message that is displayed when a member selects a creneau matching (day of week, time) from member space
```
  Yvon authored Apr 19, 2024
  074a03f9 Browse Files
- Merge branch '6001-CAGETTE-repercuter-les-rattrapages-deja-choisis-du-suppléant'… · 3a3e7d21
```
Merge branch '6001-CAGETTE-repercuter-les-rattrapages-deja-choisis-du-suppléant' into 'dev_cooperatic'

fix computation of new makeups_to_do of titulaire when creating pair by taking…

See merge request !265
```
  Yvon Kerdoncuff authored Apr 19, 2024
  3a3e7d21 Browse Files
- simplify comments · 28c47c33
  Yvon authored Apr 19, 2024
  
  28c47c33 Browse Files
- Merge branch '6190-fix-variable-used' into 'dev_cooperatic' · 1dea5f90
```
change variable used

See merge request !267
```
  Yvon Kerdoncuff authored Apr 19, 2024
  1dea5f90 Browse Files
- change variable used · 0da18eed
  Damien Moulard authored Apr 19, 2024
  
  0da18eed Browse Files
- Merge branch 'dev_cooperatic' of… · b17fddc3
```
Merge branch 'dev_cooperatic' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into dev_cooperatic
```
  Damien Moulard authored Apr 19, 2024
  b17fddc3 Browse Files
- add try/except for error case · fe9996d3
  Damien Moulard authored Apr 19, 2024
  
  fe9996d3 Browse Files
- Merge branch '6190-CAGETTE-sur-brinks-cacher-le-doublon-user-rattache-non-coop'… · 7fd786cc
```
Merge branch '6190-CAGETTE-sur-brinks-cacher-le-doublon-user-rattache-non-coop' into 'dev_cooperatic'

6190 cagette sur brinks cacher le doublon user rattache non coop

See merge request !266
```
  Damien Moulard authored Apr 19, 2024
  7fd786cc Browse Files
12 Apr, 2024 3 commits
- comment · 089df0ea
  Yvon authored Apr 12, 2024
  
  089df0ea Browse Files
- do not fetch res_partner with parent_member_num when looking for members with… · 0d99ba40
```
do not fetch res_partner with parent_member_num when looking for members with short option (associated to a search from brinks)
```
  Yvon authored Apr 12, 2024
  0d99ba40 Browse Files
- fix computation of new makeups_to_do of titulaire when creating pair by taking… · b0d4dc2e
```
fix computation of new makeups_to_do of titulaire when creating pair by taking into account already selected makeups of suppleant
```
  Yvon authored Apr 12, 2024
  b0d4dc2e Browse Files
05 Apr, 2024 1 commit
- prevent saving negative value for makeups_to_do in db · 61251cd1
  Yvon authored Apr 05, 2024
  
  61251cd1 Browse Files
21 Mar, 2024 3 commits
- Merge branch 'fix_bug_process_picking' into 'dev_cooperatic' · 3f1b6284
```
Fix bug cas étiquette rayons à imprimer si le code-barre est absent

See merge request !263
```
  Yvon Kerdoncuff authored Mar 21, 2024
  3f1b6284 Browse Files
- Changement paramétrage étiquette rayons Graoucoop · aa66e1ec
  François C. authored Mar 21, 2024
  
  aa66e1ec Browse Files
- Fix bug cas étiquette rayons à imprimer si le code-barre est absent · cdd8bbb0
  François C. authored Mar 21, 2024
  
  cdd8bbb0 Browse Files
10 Mar, 2024 5 commits
- Merge branch 'dev_cooperatic' into graoucoop_prod · 4b979422
  Yvon authored Mar 10, 2024
  
  4b979422 Browse Files
- Merge branch 'graoucoop_tmp' into graoucoop_prod · 23e45910
  François C. authored Mar 10, 2024
  
  23e45910 Browse Files
- Merge branch 'dev_cooperatic' into graoucoop_prod · a3af6275
  Yvon authored Mar 10, 2024
  
  a3af6275 Browse Files
- Merge remote-tracking branch 'origin/graoucoop_tmp' into graoucoop_prod · 184699b5
  François C. authored Mar 10, 2024
  
  184699b5 Browse Files
- Merge branch 'dev_cooperatic' into graoucoop_prod · ffc60baa
  Yvon authored Mar 10, 2024
  
  ffc60baa Browse Files