Commits · 1878934342d4da5737c32c36ff84ee83acf95f37 · cooperatic-foodcoops / third-party · GitLab

21 Jun, 2022 2 commits
- Merge branch 'dev_cooperatic' into 3292-alert-message-barrecode · 18789343
  Félicie authored Jun 21, 2022
  
  18789343 Browse Files
- alert changed · a6f73d2a
  Félicie authored Jun 21, 2022
  
  a6f73d2a Browse Files
20 Jun, 2022 4 commits
- Merge branch '3199-fix-bdm-admin-shifts-calendar' into 'dev_cooperatic' · 4f582f12
```
3199 fix bdm admin shifts calendar

See merge request !182
```
  Administrator authored Jun 20, 2022
  4f582f12 Browse Files
- Merge branch 'ticket_3287' into 'dev_cooperatic' · ad1eda68
```
Ajout de message informatif si le code-barre soumis n'est pas valide

See merge request !181
```
  Damien Moulard authored Jun 20, 2022
  ad1eda68 Browse Files
- [BDM ADMIN] fix shifts calendar error · 224504d7
  Damien Moulard authored Jun 20, 2022
  
  224504d7 Browse Files
- Ajout de message informatif si le code-barre soumis n'est pas valide · 01df4d84
  François C. authored Jun 20, 2022
  
  01df4d84 Browse Files
03 Jun, 2022 2 commits
- #3037 Fix wrong next step in inventory processus · edd0e0df
  François C. authored Jun 03, 2022
  
  edd0e0df Browse Files
- #3182 : Fix BDM manage shift js error · cc917b9e
  François C. authored Jun 03, 2022
  
  cc917b9e Browse Files
02 Jun, 2022 2 commits
- Merge branch 'for_qa_auth' into 'dev_cooperatic' · 0d8734ce
```
Added route and method to allow external authentification (Questions2Answers plugin)

See merge request !180
```
  Administrator authored Jun 02, 2022
  0d8734ce Browse Files
- Modify sent data to allow handle setting for external login · 300bc6a4
  François C. authored Jun 02, 2022
  
  300bc6a4 Browse Files
01 Jun, 2022 2 commits
- Add data when external login · 4827eed4
  François C. authored Jun 01, 2022
  
  4827eed4 Browse Files
- Adaptations pour connexion via formulaire externe · 1dde715e
  François C. authored Jun 01, 2022
  
  1dde715e Browse Files
25 May, 2022 4 commits
- Merge branch '3124-inv-scan-product-not-found' into 'dev_cooperatic' · 9afd5f37
```
fix bug bipping a product not in shelf

See merge request !179
```
  François C. authored May 25, 2022
  9afd5f37 Browse Files
- fix debounce func & lint · b01f1a25
  Damien Moulard authored May 25, 2022
  
  b01f1a25 Browse Files
- fix comment · 63cba6a6
  Damien Moulard authored May 25, 2022
  
  63cba6a6 Browse Files
- fix bug bipping a product not in shelf · 68167d3e
  Damien Moulard authored May 25, 2022
  
  68167d3e Browse Files
24 May, 2022 5 commits
- Merge branch '3036-inv-wrong-time' into 'dev_cooperatic' · 05ba2c3d
```
INV: save UTC time & display according to locale timezone (+ linting)

See merge request !177
```
  François C. authored May 24, 2022
  05ba2c3d Browse Files
- fix merge conflict · 9906d8ca
  Damien Moulard authored May 24, 2022
  
  9906d8ca Browse Files
- Merge branch 'dev_cooperatic' of… · c1f2b126
```
Merge branch 'dev_cooperatic' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into dev_cooperatic
```
  Damien Moulard authored May 24, 2022
  c1f2b126 Browse Files
- INV: save new qty only when validate pressed, not when cancel pressed · 870ff1e2
  Damien Moulard authored May 24, 2022
  
  870ff1e2 Browse Files
- Merge branch 'ticket_3074' into 'dev_cooperatic' · f37478e9
```
#3074 Prevent associated people to be granted more than once for having done shift together

See merge request !178
```
  Damien Moulard authored May 24, 2022
  f37478e9 Browse Files
23 May, 2022 3 commits
- #3074 Prevent associated people to be granted more than once for having done shift together · b81df9a3
  François C. authored May 23, 2022
  
  b81df9a3 Browse Files
- Prevent 'sort_order' key error when sorting members settings (members/config · 279197e3
  François C. authored May 23, 2022
  
  279197e3 Browse Files
- INV: save UTC time & display according to locale timezone (+ linting) · f8b23369
  Damien Moulard authored May 23, 2022
  
  f8b23369 Browse Files
06 May, 2022 9 commits
- Add lost part of code during merge_requests/169 (shelfs/models.py) · 4f963d49
  François C. authored May 06, 2022
  
  4f963d49 Browse Files
- Use $.notify instead of alert to display success message after shelf change · c63a256a
  François C. authored May 06, 2022
  
  c63a256a Browse Files
- Display U instead of Unité(s) only when Autres column is displayed (#3040) · e7103678
  François C. authored May 06, 2022
  
  e7103678 Browse Files
- Merge branch '2997-reception-error-bip-products' into 'dev_cooperatic' · e75905fd
```
REC: fix product scanned 2nd time

See merge request !176
```
  François C. authored May 06, 2022
  e75905fd Browse Files
- Merge branch 'story_2824' into 'dev_cooperatic' · 26bae4b3
```
Add change product shelf function

See merge request !175
```
  Damien Moulard authored May 06, 2022
  26bae4b3 Browse Files
- Modifications (see PR 175 comments) · e42f5e6f
  François C. authored May 06, 2022
  
  e42f5e6f Browse Files
- linting · d9189217
  Damien Moulard authored May 06, 2022
  
  d9189217 Browse Files
- REC: fix product scanned 2nd time · da215ede
  Damien Moulard authored May 06, 2022
  
  da215ede Browse Files
- Add comment to make_products_shelf_links · e501da63
  François C. authored May 06, 2022
  
  e501da63 Browse Files
05 May, 2022 7 commits
- Merge branch '3017-reception-display-step1-qties-in-step2' into 'dev_cooperatic' · bc6ab168
```
REC: display received qty in prices step

See merge request !174
```
  François C. authored May 05, 2022
  bc6ab168 Browse Files
- Display U instead of Unité(s) to make lines more readable · 2f994b0d
  François C. authored May 05, 2022
  
  2f994b0d Browse Files
- Merge branch '2823-delete-ongoing-shelf-inventory' into 'dev_cooperatic' · 2384a390
```
INV: delete ongoing inventory from shelves list

See merge request !173
```
  François C. authored May 05, 2022
  2384a390 Browse Files
- Add change product shelf function · 8a14e906
  François C. authored May 05, 2022
  
  8a14e906 Browse Files
- REC: display received qty in prices step · a2126725
  Damien Moulard authored May 05, 2022
  
  a2126725 Browse Files
- Merge branch '2827-print-from-inv' into 'dev_cooperatic' · 841076df
```
add print action

See merge request !172
```
  Damien Moulard authored May 05, 2022
  841076df Browse Files
- shelf admin: display correct prices in ad products screen · f76c2e27
  Damien Moulard authored May 05, 2022
  
  f76c2e27 Browse Files