Commits · 68167d3ef7ba01f28cabace9d0207ee70ecb41ff · cooperatic-foodcoops / third-party · GitLab

25 May, 2022 1 commit
- fix bug bipping a product not in shelf · 68167d3e
  Damien Moulard authored May 25, 2022
  
  68167d3e Browse Files
24 May, 2022 3 commits
- 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 2 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
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 13 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
- Merge branch 'ticket_2828' into 'dev_cooperatic' · a5931d7c
```
Ticket 2828

See merge request !171
```
  Damien Moulard authored May 05, 2022
  a5931d7c Browse Files
- INV: delete ongoing inventory from shelves list · 589eaebb
  Damien Moulard authored May 05, 2022
  
  589eaebb Browse Files
- Adaptations suite remarques PR 171 · 7dfcbf2f
  François C. authored May 05, 2022
  
  7dfcbf2f Browse Files
- fix merge conflict · 67d289d4
  Damien Moulard authored May 05, 2022
  
  67d289d4 Browse Files
- RAY: admin add product fix ui issues · 4ee73655
  Damien Moulard authored May 05, 2022
  
  4ee73655 Browse Files
- standard price added · 23e4c295
  Félicie authored May 05, 2022
  
  23e4c295 Browse Files
04 May, 2022 11 commits
- Merge branch '2947-merged-orders-order-by-po' into 'dev_cooperatic' · e5f44f2b
```
[REC] for grouped orders display order in list for ordering

See merge request !170
```
  François C. authored May 04, 2022
  e5f44f2b Browse Files
- Adaptations lisibilité colonnes · 79cebb4d
  François C. authored May 04, 2022
  
  79cebb4d Browse Files
- add print action · 756d37f7
  Thibault Grandjean authored May 04, 2022
  
  756d37f7 Browse Files
- Merge branch 'dev_cooperatic' into 'ticket_2828' · 0d39f02b
```
# Conflicts:
#   shelfs/static/js/shelf_inventory.js
```
  François C. authored May 04, 2022
  0d39f02b Browse Files
- Add barcode encoded qty functionality to shelf inventory interface · ae224347
  François C. authored May 04, 2022
  
  ae224347 Browse Files
- Merge branch '3001-display-last-product-added-date' into 'dev_cooperatic' · acd357d1
```
INV: display last product added date

See merge request !169
```
  François C. authored May 04, 2022
  acd357d1 Browse Files
- Merge branch 'dev_cooperatic' into '3001-display-last-product-added-date' · 1eecca46
```
# Conflicts:
#   shelfs/models.py
```
  François C. authored May 04, 2022
  1eecca46 Browse Files
- Merge branch '2822-date-begin-inventory' into 'dev_cooperatic' · b400240d
```
INV: display ongoing inventory start datetime + shelfs module linting

See merge request !167
```
  François C. authored May 04, 2022
  b400240d Browse Files
- [REC] for grouped orders display order in list for ordering · d4477c71
  Damien Moulard authored May 04, 2022
  
  d4477c71 Browse Files
- Merge branch '2821-inventory-optimization' into 'dev_cooperatic' · 6cf814b0
```
2821-inventory-optimization

See merge request !168
```
  Damien Moulard authored May 04, 2022
  6cf814b0 Browse Files
- INV: fix comment · fd3417ae
  Damien Moulard authored May 04, 2022
  
  fd3417ae Browse Files
03 May, 2022 1 commit
- WIP: Add barcode encoded qty functionality to shelf inventory interface · e2a1e194
  François C. authored May 03, 2022
  
  e2a1e194 Browse Files