Commits · docker · cooperatic-foodcoops / odoo · GitLab

21 Feb, 2022 2 commits
- run odoo in docker-compose · 27d57597
  Thibault Grandjean authored Feb 21, 2022
  
  27d57597 Browse Files
- Merge branch 'dev_cooperatic' of https://gl.cooperatic.fr/cooperatic-foodcoops/odoo into docker · a747b1f9
  Thibault Grandjean authored Feb 21, 2022
  
  a747b1f9 Browse Files
09 Feb, 2022 7 commits
- Fix oder => order syntax · 59273361
  François C. authored Feb 09, 2022
  
  59273361 Browse Files
- Merge branch '2245-made-paper-meal-vouhcer-usable-once' into 'dev_cooperatic' · e46288b7
```
display a popup if the meal voucher was already scan on this order

See merge request !27
```
  François C. authored Feb 09, 2022
  e46288b7 Browse Files
- Merge branch 'dev_cooperatic' into '2245-made-paper-meal-vouhcer-usable-once' · ae3e4f87
```
# Conflicts:
#   lacagette_addons/pos_meal_voucher/i18n/fr.po
#   lacagette_addons/pos_meal_voucher/static/src/js/screens.js
```
  François C. authored Feb 09, 2022
  ae3e4f87 Browse Files
- Merge branch '2244-lock-paper-meal-voucher' into 'dev_cooperatic' · 2d9688f3
```
2244 lock paper meal voucher

See merge request !26
```
  François C. authored Feb 09, 2022
  2d9688f3 Browse Files
- display a popup if the meal voucher was already scan on this order · 5db467b0
  Etienne Freiss authored Feb 09, 2022
  
  5db467b0 Browse Files
- Merge branch 'dev_cooperatic' into 2244-lock-paper-meal-voucher · bb233916
  Etienne Freiss authored Feb 09, 2022
  
  bb233916 Browse Files
- work on paper meal voucher · 6b268f43
  Etienne Freiss authored Feb 09, 2022
  
  6b268f43 Browse Files
07 Feb, 2022 1 commit
- Merge branch 'meal-vouchers' into 'dev_cooperatic' · 4183965e
```
Intégration Meal vouchers et fix makeup missed case

See merge request !25
```
  François C. authored Feb 07, 2022
  4183965e Browse Files
04 Feb, 2022 1 commit
- add 2 makeups if a makeup shift is missed · e9d98f1c
  Damien Moulard authored Feb 04, 2022
  
  e9d98f1c Browse Files
02 Feb, 2022 9 commits
- Merge branch '2150-auto-complete-cb-meal-voucher-amount' into 'meal-vouchers' · 87d5994b
```
develop

See merge request !22
```
  François C. authored Feb 02, 2022
  87d5994b Browse Files
- Merge branch '1996-see-meal-voucher-products-on-ticket' into 'meal-vouchers' · a55cb992
```
display symbol on pos ticket for products associated with meal vouchers, when used

See merge request !21
```
  François C. authored Feb 02, 2022
  a55cb992 Browse Files
- add readme · 180b2d14
  Etienne Freiss authored Feb 02, 2022
  
  180b2d14 Browse Files
- Merge branch 'meal-vouchers' of… · 1bb05c97
```
Merge branch 'meal-vouchers' of https://gl.cooperatic.fr/cooperatic-foodcoops/odoo into 2144-check-if-meal-voucher-amount-is-relevant
```
  Etienne Freiss authored Feb 02, 2022
  1bb05c97 Browse Files
- Merge branch 'meal-vouchers' into 2150-auto-complete-cb-meal-voucher-amount · 0eee7d82
  Etienne Freiss authored Feb 02, 2022
  
  0eee7d82 Browse Files
- Merge branch '2158-check-if-meal-voucher-card-amount-is-relevant' into 'meal-vouchers' · 460c0821
```
2158 check if meal voucher card amount is relevant

See merge request !23
```
  Damien Moulard authored Feb 02, 2022
  460c0821 Browse Files
- fix about max amount of meal voucher · f8e9aea7
  Etienne Freiss authored Feb 02, 2022
  
  f8e9aea7 Browse Files
- develop · a07a5ab5
  Etienne Freiss authored Feb 02, 2022
  
  a07a5ab5 Browse Files
- add of popup if amount exceded · 2d9449d7
  Etienne Freiss authored Feb 02, 2022
  
  2d9449d7 Browse Files
01 Feb, 2022 2 commits
- Modif. Pensez à mettre à jour le module · 56ebb334
  Etienne Freiss authored Feb 01, 2022
  
  56ebb334 Browse Files
- better detection of meal voucher payment lines · 8c470aae
  Damien Moulard authored Feb 01, 2022
  
  8c470aae Browse Files
31 Jan, 2022 3 commits
- display symbol on pos ticket for products associated with meal vouchers, when used · 87ebf8c9
  Damien Moulard authored Jan 31, 2022
  
  87ebf8c9 Browse Files
- Merge branch 'meal-vouchers' into docker · 3cd0ed8a
  Thibault Grandjean authored Jan 31, 2022
  
  3cd0ed8a Browse Files
- add meals voucher module · 7cd0bdea
  Damien Moulard authored Jan 31, 2022
  
  7cd0bdea Browse Files
26 Jan, 2022 4 commits
- Merge branch 'dev_cooperatic' of gl.cooperatic.fr:cooperatic-foodcoops/odoo into dev_cooperatic · 30e94f4c
  Damien Moulard authored Jan 26, 2022
  
  30e94f4c Browse Files
- fix indent error · 26faa235
  Damien Moulard authored Jan 26, 2022
  
  26faa235 Browse Files
- Merge branch '#1965' into 'dev_cooperatic' · 53cb1f53
```
#1965 Dans le module Inventaire, des commandes passées en caisse ne sont pas impactées dans les stocks

See merge request !19
```
  François C. authored Jan 26, 2022
  53cb1f53 Browse Files
- update partner target status also when points are added · 72e81ad2
  Damien Moulard authored Jan 26, 2022
  
  72e81ad2 Browse Files
24 Jan, 2022 1 commit
- Merge branch 'fix-points-update-during-unsubscribe' into 'dev_cooperatic' · bd819db7
```
add points instead of forcing points counter when unbsuscribing partner

See merge request !18
```
  Etienne Freiss authored Jan 24, 2022
  bd819db7 Browse Files
20 Jan, 2022 2 commits
- code Beesdoo · d2f56e44
  Etienne Freiss authored Jan 20, 2022
  
  d2f56e44 Browse Files
- add points instead of forcing points counter when unbsuscribing partner · aee62659
  Damien Moulard authored Jan 20, 2022
  
  aee62659 Browse Files
17 Dec, 2021 1 commit
- #1929: Add minimal stock attribute to product.template · d5e94325
  François C. authored Dec 17, 2021
  
  d5e94325 Browse Files
16 Dec, 2021 2 commits
- Merge branch 'evolution_bdm' into dev_cooperatic · 30a27535
  François C. authored Dec 16, 2021
  
  30a27535 Browse Files
- #1918 add special state select item to reset to 'unsubscribed' · d68b1ab9
  François C. authored Dec 16, 2021
  
  d68b1ab9 Browse Files
15 Dec, 2021 1 commit
- docker · b0627233
  Thibault Grandjean authored Dec 15, 2021
  
  b0627233 Browse Files
25 Nov, 2021 1 commit
- Merge branch 'renaud/989-shift-update-bug' into 'dev_cooperatic' · e13b7bec
```
Renaud/989 shift update bug

See merge request !17
```
  François C. authored Nov 25, 2021
  e13b7bec Browse Files
24 Nov, 2021 2 commits
- Merge branch 'evolution_bdm' of gl.cooperatic.fr:cooperatic-foodcoops/odoo into evolution_bdm · 0ebfe020
  François C. authored Nov 24, 2021
  
  0ebfe020 Browse Files
- #1774: current extensions are being closed when coop is being unsubscribe · 52e4881c
  François C. authored Nov 24, 2021
  
  52e4881c Browse Files
23 Nov, 2021 1 commit
- Remove trace in odoo/addons/point_of_sale/static/src/js/db.js for QuotaExceeded debug · 836ef48f
  François C. authored Nov 23, 2021
  
  836ef48f Browse Files