Commits · bc6ab1686007cf2ce36556a2e53ee9a96090370b · cooperatic-foodcoops / third-party · GitLab

05 May, 2022 12 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
- 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 10 commits
- WIP: Add barcode encoded qty functionality to shelf inventory interface · e2a1e194
  François C. authored May 03, 2022
  
  e2a1e194 Browse Files
- Merge branch 'dev_cooperatic' into 2821-inventory-optimization · 9d0aaeff
  Félicie authored May 03, 2022
  
  9d0aaeff Browse Files
- refresh added · 4716ad2b
  Félicie authored May 03, 2022
  
  4716ad2b Browse Files
- INV: display last product added date · e0b4c3d8
  Damien Moulard authored May 03, 2022
  
  e0b4c3d8 Browse Files
- inventory optimization · 567346cc
  Félicie authored May 03, 2022
  
  567346cc Browse Files
- INV: display ongoing inventory start datetime + shelfs module linting · 20b4c4a0
  Damien Moulard authored May 03, 2022
  
  20b4c4a0 Browse Files
- Fix conflict · 793d102f
  François C. authored May 03, 2022
  
  793d102f Browse Files
- Merge branch '2930-bad-link' into 'dev_cooperatic' · c16205e6
```
BDM: fix Ask BDM buttons

See merge request !165
```
  François C. authored May 03, 2022
  c16205e6 Browse Files
- Merge branch '2826-price-product' into 'dev_cooperatic' · 5bbc317f
```
2826 price product

See merge request !166
```
  François C. authored May 03, 2022
  5bbc317f Browse Files
- #2825 : improve alias recognition · d66c0789
  François C. authored May 03, 2022
  
  d66c0789 Browse Files
02 May, 2022 7 commits
- Merge branch 'dev_cooperatic' into 2826-price-product · 86edeac7
  Félicie authored May 02, 2022
  
  86edeac7 Browse Files
- price added" · 8c4e7e33
  Félicie authored May 02, 2022
  
  8c4e7e33 Browse Files
- BDM: fix Ask BDM buttons · 812477a2
  Damien Moulard authored May 02, 2022
  
  812477a2 Browse Files
- Merge branch 'dev_cooperatic' into 'dev_principale' · 04aedf66
```
Intégration des dév. Cooperatic pour la Cagette

See merge request !164
```
  François C. authored May 02, 2022
  04aedf66 Browse Files
- Merge branch '2916-insciptions-register-to-comittees' into 'dev_cooperatic' · b1c17470
```
INS: register to comitees shift

See merge request !163
```
  François C. authored May 02, 2022
  b1c17470 Browse Files
- Merge branch '2804-alc-comment-area' into 'dev_cooperatic' · ddfc6eb2
```
ALC: common info textarea in orders selection screen

See merge request !162
```
  François C. authored May 02, 2022
  ddfc6eb2 Browse Files
- Hide 'informations' zone when not connected (orders helper) · 20d68cbe
  François C. authored May 02, 2022
  
  20d68cbe Browse Files