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

17 Jan, 2022 6 commits
- Merge branch 'revert-ff904c5a' into 'dev_principale' · d45dfe93
```
Revert "Revert "Merge branch 'ticket_1738' into 'dev_principale'""

See merge request !102
```
  Damien Moulard authored Jan 17, 2022
  d45dfe93 Browse Files
- Revert "Revert "Merge branch 'ticket_1738' into 'dev_principale'"" · 4fc4f783
```
This reverts commit ff904c5a
```
  Damien Moulard authored Jan 17, 2022
  4fc4f783 Browse Files
- Merge branch 'revert-b190df6e' into 'dev_principale' · 3f9684a6
```
Revert "merge dev_cooperatic into dev_principale"

See merge request !100
```
  Damien Moulard authored Jan 17, 2022
  3f9684a6 Browse Files
- Revert "merge dev_cooperatic into dev_principale" · df42ebaf
```
This reverts commit b190df6e
```
  Damien Moulard authored Jan 17, 2022
  df42ebaf Browse Files
- merge dev_cooperatic into dev_principale · b190df6e
  Damien Moulard authored Jan 17, 2022
  
  b190df6e Browse Files
- Merge branch 'Reception_poids' into 'dev_principale' · 7606f015
```
Détection automatique du poids par l'appli reception

See merge request !54
```
  Damien Moulard authored Jan 17, 2022
  7606f015 Browse Files
14 Jan, 2022 1 commit
- fix url catch in members space · 735fb6a9
  Damien Moulard authored Jan 14, 2022
  
  735fb6a9 Browse Files
13 Jan, 2022 1 commit
- dont prevent makeups to add 1pt when present · d04ec3d3
  Damien Moulard authored Jan 13, 2022
  
  d04ec3d3 Browse Files
21 Dec, 2021 1 commit
- Add context to odoo api update · 21df373f
  François C. authored Dec 21, 2021
  
  21df373f Browse Files
18 Dec, 2021 5 commits
- Merge branch 'fix_faq_accordion_bug' into dev_cooperatic · b479fafd
  François C. authored Dec 18, 2021
  
  b479fafd Browse Files
- Fix FAQ accordion bug · b6ec85ac
  François C. authored Dec 18, 2021
  
  b6ec85ac Browse Files
- Merge branch '1958-change-message-shifts-exchange-gone' into 'dev_cooperatic' · 773d5ea8
```
1958 Change message for gone status

See merge request !99
```
  François C. authored Dec 18, 2021
  773d5ea8 Browse Files
- Merge branch '1858-readonly-calendar' into 'dev_cooperatic' · f29bd89b
```
1858 readonly calendar

See merge request !98
```
  François C. authored Dec 18, 2021
  f29bd89b Browse Files
- #1961 : Add minimal stock to quantities to order (and add explaination) · 9888cd4e
  François C. authored Dec 18, 2021
  
  9888cd4e Browse Files
17 Dec, 2021 11 commits
- Merge branch 'dev_cooperatic' into 1858-readonly-calendar · ec166c05
  Thibault Grandjean authored Dec 17, 2021
  
  ec166c05 Browse Files
- Change message for gone status · 2f39f336
  Thibault Grandjean authored Dec 17, 2021
  
  2f39f336 Browse Files
- #1928 : remove (+ ou -) from placeholder · e2469f81
  François C. authored Dec 17, 2021
  
  e2469f81 Browse Files
- Merge branch 'tickets_1929_1934' into dev_cooperatic · 01f05447
  François C. authored Dec 17, 2021
  
  01f05447 Browse Files
- Merge branch '1960-button-faq' into 'dev_cooperatic' · db2d1ac2
```
1960-button-faq

See merge request !97
```
  François C. authored Dec 17, 2021
  db2d1ac2 Browse Files
- Merge branch '1959-text-faq' into 'dev_cooperatic' · c92a483b
```
1959 text faq

See merge request !96
```
  François C. authored Dec 17, 2021
  c92a483b Browse Files
- #1929 #1934 : Allow user to set minimal stock and set NPA / FDS for each product… · 799fe052
```
#1929 #1934 : Allow user to set minimal stock and set NPA / FDS for each product in Orders Helper interface
```
  François C. authored Dec 17, 2021
  799fe052 Browse Files
- button and text added · ead1ac22
  Félicie authored Dec 17, 2021
  
  ead1ac22 Browse Files
- 1915 display read only calendar for comite members · 47bc1fde
  Thibault Grandjean authored Dec 17, 2021
  
  47bc1fde Browse Files
- space added · d5e449bd
  Félicie authored Dec 17, 2021
  
  d5e449bd Browse Files
- text added · 235ce7aa
  Félicie authored Dec 17, 2021
  
  235ce7aa Browse Files
16 Dec, 2021 10 commits
- #1495 add percent adjustment to compute needed products · a325f466
  François C. authored Dec 16, 2021
  
  a325f466 Browse Files
- Merge branch '1494-sort-by' into 'dev_cooperatic' · 5e8434ac
```
1494  function sort by last choice added

See merge request !95
```
  François C. authored Dec 16, 2021
  5e8434ac Browse Files
- function sort by last choice added · c31c5d18
  Félicie authored Dec 16, 2021
  
  c31c5d18 Browse Files
- Merge branch '1827-handle-gone-status' into 'dev_cooperatic' · 993f9584
```
1827 handle gone status

See merge request !94
```
  François C. authored Dec 16, 2021
  993f9584 Browse Files
- Merge branch '1838_change_message_last_minute_exchange_shifts' into 'dev_cooperatic' · a4b006ce
```
Add space at end of line

See merge request !93
```
  François C. authored Dec 16, 2021
  a4b006ce Browse Files
- Merge branch '1850-update-msg-ba' into 'dev_cooperatic' · ba6dca05
```
bold text

See merge request !92
```
  François C. authored Dec 16, 2021
  ba6dca05 Browse Files
- #1828 Fix history bug · deb54845
  François C. authored Dec 16, 2021
  
  deb54845 Browse Files
- Add gone status · d307779f
  Thibault Grandjean authored Dec 16, 2021
  
  d307779f Browse Files
- bold text · 0987bb5e
  Thibault Grandjean authored Dec 16, 2021
  
  0987bb5e Browse Files
- Add space at end of line · aca84b03
  Thibault Grandjean authored Dec 16, 2021
  
  aca84b03 Browse Files
15 Dec, 2021 5 commits
- Merge branch 'dev_cooperatic' of… · a6493b55
```
Merge branch 'dev_cooperatic' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into dev_cooperatic
```
  François C. authored Dec 15, 2021
  a6493b55 Browse Files
- Fix standard point added if shift is moved using members_space interface · cb6a66fe
  François C. authored Dec 15, 2021
  
  cb6a66fe Browse Files
- Merge branch '1492-order-press-enter' into 'dev_cooperatic' · 96190610
```
1492 - press enter added

See merge request !90
```
  François C. authored Dec 15, 2021
  96190610 Browse Files
- Merge branch 'dev_cooperatic' into '1492-order-press-enter' · 59cec0ae
```
# Conflicts:
#   orders/static/js/orders_helper.js
```
  Félicie authored Dec 15, 2021
  59cec0ae Browse Files
- comment edited · 69547f1c
  Félicie authored Dec 15, 2021
  
  69547f1c Browse Files