Commits · 67cfd5325459a363c89d75971dbd1e044f9f9441 · cooperatic-foodcoops / odoo · GitLab

05 Apr, 2022 1 commit
- Merge branch 'dev_cooperatic' of gl.cooperatic.fr:cooperatic-foodcoops/odoo into dev_cooperatic · 67cfd532
  François C. authored Apr 05, 2022
  
  67cfd532 Browse Files
01 Apr, 2022 1 commit
- Merge branch 'curtlery_pos_meal_voucher' into 'dev_cooperatic' · d0f2ff08
```
Relace Curtlery icon by # when printing pos receipt

See merge request !35
```
  François C. authored Apr 01, 2022
  d0f2ff08 Browse Files
30 Mar, 2022 3 commits
- Modify img src att for curtlery · 283695de
  François C. authored Mar 30, 2022
  
  283695de Browse Files
- Fix syntax error on curtlery_img_src declaration · ee7dc519
  François C. authored Mar 30, 2022
  
  ee7dc519 Browse Files
- Use of base64 src for Curtlery picto when send to printer · ca72d8b4
  François C. authored Mar 30, 2022
  
  ca72d8b4 Browse Files
25 Mar, 2022 1 commit
- Merge branch '2613-fix-pos-ticket-with-meal-vouchers' into 'dev_cooperatic' · 07d82be9
```
2613-fix-pos-ticket-with-meal-vouchers

See merge request !34
```
  Etienne Freiss authored Mar 25, 2022
  07d82be9 Browse Files
24 Mar, 2022 3 commits
- remove dev code & add cutlery symbol to subtotal · 28ea6dd1
  Damien Moulard authored Mar 24, 2022
  
  28ea6dd1 Browse Files
- display cutlery symbol directly in template as svg · 388ec710
  Damien Moulard authored Mar 24, 2022
  
  388ec710 Browse Files
- fix meal voucher subtotal display on pos ticket · 5743b9cb
  Damien Moulard authored Mar 24, 2022
  
  5743b9cb Browse Files
23 Mar, 2022 1 commit
- Merge branch '2482-receipt-meal-voucher-subtotal' into 'dev_cooperatic' · 89de62bc
```
display subtotal eligible for meal vouchers on receipt

See merge request !33
```
  Etienne Freiss authored Mar 23, 2022
  89de62bc Browse Files
22 Mar, 2022 1 commit
- display subtotal eligible for meal vouchers on receipt · 56e5974c
  Damien Moulard authored Mar 22, 2022
  
  56e5974c Browse Files
09 Mar, 2022 2 commits
- Fix purchase_compute_order error when a product is no more available for a supplier · 695c942f
  François C. authored Mar 09, 2022
  
  695c942f Browse Files
- Merge branch 'dev_cooperatic' of… · dcf8a236
```
Merge branch 'dev_cooperatic' of https://gl.cooperatic.fr/cooperatic-foodcoops/Odoo into dev_cooperatic
```
  François C. authored Mar 09, 2022
  dcf8a236 Browse Files
07 Mar, 2022 3 commits
- Merge branch '2251-shift-screen-associate' into 'dev_cooperatic' · a4cf6b15
```
2251 shift screen associate

See merge request !32
```
  Damien Moulard authored Mar 07, 2022
  a4cf6b15 Browse Files
- Merge branch 'dev_cooperatic' into 2251-shift-screen-associate · 2397c59d
  Etienne Freiss authored Mar 07, 2022
  
  2397c59d Browse Files
- Change res_partner with extra_shift_done · a162f0a9
  Etienne Freiss authored Mar 07, 2022
  
  a162f0a9 Browse Files
04 Mar, 2022 1 commit
- Fix KeyError 'statement_note' · 5c4fef90
  François C. authored Mar 04, 2022
  
  5c4fef90 Browse Files
24 Feb, 2022 3 commits
- Merge branch '2249-shift-registered-associate' into 'dev_cooperatic' · 0fcca2ac
```
2249-shift-registered-associate

See merge request !31
```
  Thibault Grandjean authored Feb 24, 2022
  0fcca2ac Browse Files
- Merge branch '2341-display-meal-voucher-only-on-pos-activated' into 'dev_cooperatic' · 89b11cb3
```
hide meal voucher if it's not activated

See merge request !28
```
  Etienne Freiss authored Feb 24, 2022
  89b11cb3 Browse Files
- fix selector undefined · 469eaca5
  Thibault Grandjean authored Feb 24, 2022
  
  469eaca5 Browse Files
23 Feb, 2022 8 commits
- Merge branch '2175-serch-coop-number' into 'dev_cooperatic' · bbde8038
```
2175 search coop number

See merge request !30
```
  Damien Moulard authored Feb 23, 2022
  bbde8038 Browse Files
- Merge branch 'dev_cooperatic' into 2175-serch-coop-number · 20ded4b7
  Félicie authored Feb 23, 2022
  
  20ded4b7 Browse Files
- parameter changed · d70ec7c1
  Félicie authored Feb 23, 2022
  
  d70ec7c1 Browse Files
- Merge branch '2246-keep-log-paper-meal-voucher' into 'dev_cooperatic' · b414b37c
```
develop

See merge request !29
```
  Damien Moulard authored Feb 23, 2022
  b414b37c Browse Files
- develop · 1187e2a4
  Etienne Freiss authored Feb 23, 2022
  
  1187e2a4 Browse Files
- console log removed · 832245d2
  Félicie authored Feb 23, 2022
  
  832245d2 Browse Files
- parameter used · 128a6532
  Félicie authored Feb 23, 2022
  
  128a6532 Browse Files
- parameter added · 96f15a4f
  Félicie authored Feb 23, 2022
  
  96f15a4f Browse Files
22 Feb, 2022 5 commits
- change method to check if meal voucher is activated on pos · 37d90424
  Thibault Grandjean authored Feb 22, 2022
  
  37d90424 Browse Files
- hide meal voucher if it's not activated · 0b42a4c6
  Thibault Grandjean authored Feb 22, 2022
  
  0b42a4c6 Browse Files
- develop · bc2a0f31
  Etienne Freiss authored Feb 22, 2022
  
  bc2a0f31 Browse Files
- add security to ensure points will be added · 2f19b44e
  Damien Moulard authored Feb 22, 2022
  
  2f19b44e Browse Files
- fix potential error that people get more makeups than they should · 6f151f38
  Damien Moulard authored Feb 22, 2022
  
  6f151f38 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