Commits · e26663ec37dd9d95170b0b85fd10308f119ecd63 · agplv3 / kohinos-tav · GitLab

14 Mar, 2024 3 commits
- merge conflicts · e26663ec
  Damien Moulard authored Mar 14, 2024
  
  e26663ec Browse Files
- quick fix · c203aeb3
  Damien Moulard authored Mar 14, 2024
  
  c203aeb3 Browse Files
- allowance based on household · d621a4fd
  Damien Moulard authored Mar 14, 2024
  
  d621a4fd Browse Files
13 Mar, 2024 3 commits
- add new cotisation and allocation amounts to adherent, add fields to adherent… · 4ce2d41f
```
add new cotisation and allocation amounts to adherent, add fields to adherent admin, calculate allocation based on household at saving in admin
```
  Damien Moulard authored Mar 13, 2024
  4ce2d41f Browse Files
- Merge branch '5866-encaissement-calculate-amount-based-on-conventionnement' into 'ssa-gironde' · 3a401fc8
```
calculate encaissement max amount based on conventionnement

See merge request cooperatic/kohinos-tav!72
```
  Yvon Kerdoncuff authored Mar 13, 2024
  3a401fc8 Browse Files
- Merge branch '5865-cancel-transaction' into 'ssa-gironde' · 9f8b9625
```
5865 cancel transaction

See merge request cooperatic/kohinos-tav!74
```
  Damien Moulard authored Mar 13, 2024
  9f8b9625 Browse Files
12 Mar, 2024 10 commits
- fix check twig var defined · 8354a851
  Yvon authored Mar 12, 2024
  
  8354a851 Browse Files
- display cancel transaction btn only in tav mode · 686870b8
  Yvon authored Mar 12, 2024
  
  686870b8 Browse Files
- add a comment · f6bedd20
  Yvon authored Mar 12, 2024
  
  f6bedd20 Browse Files
- WIP: create new method to distribute TAV allowance, based on household · 45fbd986
  Damien Moulard authored Mar 12, 2024
  
  45fbd986 Browse Files
- add btn to cancel transaction adherent prestataire in last operations drop down… · 33295215
```
add btn to cancel transaction adherent prestataire in last operations drop down admin prestataire ; back-end creates an opposite transaction prestataire adherent
```
  Yvon authored Mar 12, 2024
  33295215 Browse Files
- Merge branch 'ssa-gironde' into 5735-allowance-based-on-household · 265e0af4
  Damien Moulard authored Mar 12, 2024
  
  265e0af4 Browse Files
- Merge branch 'ssa-gironde' into 5865-cancel-transaction · 496f94c7
  Yvon authored Mar 12, 2024
  
  496f94c7 Browse Files
- Merge branch '5670-cotisants-nouvelles-infos' into 'ssa-gironde' · 55fe59bb
```
5670 cotisants nouvelles infos

See merge request cooperatic/kohinos-tav!73
```
  Yvon Kerdoncuff authored Mar 12, 2024
  55fe59bb Browse Files
- WIP · 5d8738cb
  Yvon authored Mar 12, 2024
  
  5d8738cb Browse Files
- fix payment with conventionnement errors & display remaining amount · 8e9d69ac
  Damien Moulard authored Mar 12, 2024
  
  8e9d69ac Browse Files
11 Mar, 2024 6 commits
- 6012 bug fix : fix values misleading autocompletion in some cases in adherent cotisation section · 9cba477a
  Yvon authored Mar 11, 2024
  
  9cba477a Browse Files
- dependent children wording to make it clear this is used to compute allocation · c61660c3
  Yvon authored Mar 11, 2024
  
  c61660c3 Browse Files
- 5896 : add total adult counts to household section · 1c6fbe53
  Yvon authored Mar 11, 2024
  
  1c6fbe53 Browse Files
- 5893 add household composition to household section · 7e2c6c35
  Yvon authored Mar 11, 2024
  
  7e2c6c35 Browse Files
- 5932-add-quartier-to-address-section · cb3312a3
  Yvon authored Mar 11, 2024
  
  cb3312a3 Browse Files
- 5895-add-territory-to-address-section · 7d1fb02a
  Yvon authored Mar 11, 2024
  
  7d1fb02a Browse Files
08 Mar, 2024 7 commits
- encaissement max amount based on conventionnement · b4013766
  Damien Moulard authored Mar 08, 2024
  
  b4013766 Browse Files
- Merge branch '5892-5897-enfants-a-charge-dans-section-foyer' into 'ssa-gironde' · 7ba7843f
```
create dependent child form and put it into newly created foyer section in adherent admin

See merge request cooperatic/kohinos-tav!68
```
  Damien Moulard authored Mar 08, 2024
  7ba7843f Browse Files
- WIP: calculate encaissement max amount based on conventionnement · 35151662
  Damien Moulard authored Mar 08, 2024
  
  35151662 Browse Files
- Merge branch '5867-presta-not-activated-by-default' into 'ssa-gironde' · 78b7b956
```
in case of presta_self_init_and_eval, disable prestataire by default at creation

See merge request cooperatic/kohinos-tav!71
```
  Yvon Kerdoncuff authored Mar 08, 2024
  78b7b956 Browse Files
- replace floats by string in choice value of two form fields so that data can be… · 97f09943
```
replace floats by string in choice value of two form fields so that data can be properly loaded and displayed
```
  Yvon authored Mar 08, 2024
  97f09943 Browse Files
- in case of presta_self_init_and_eval, disable prestataire by default at creation · 27dc9b63
  Damien Moulard authored Mar 08, 2024
  
  27dc9b63 Browse Files
- Merge branch '5682-display-balance-at-payment' into 'ssa-gironde' · 96a0da26
```
5682 display balance at payment

See merge request cooperatic/kohinos-tav!69
```
  Yvon Kerdoncuff authored Mar 08, 2024
  96a0da26 Browse Files
07 Mar, 2024 6 commits
- change name custody, fix wrong column name, clean useless attribute · 190bbb42
  Yvon authored Mar 07, 2024
  
  190bbb42 Browse Files
- add border with padding arround each dependent child zone · d5bedf87
  Yvon authored Mar 07, 2024
  
  d5bedf87 Browse Files
- reorganize adherent sections to avoid gap on left column · 7ff024ff
  Yvon authored Mar 07, 2024
  
  7ff024ff Browse Files
- WIP: create new method to distribute TAV allowance, based on household · ee167589
  Damien Moulard authored Mar 07, 2024
  
  ee167589 Browse Files
- quickfix · f17c1668
  Damien Moulard authored Mar 07, 2024
  
  f17c1668 Browse Files
- on cashing screen, display remaining balance in popup in case of insufficient founds · 54d2038c
  Damien Moulard authored Mar 07, 2024
  
  54d2038c Browse Files
06 Mar, 2024 5 commits
- create dependent child form and put it into newly created foyer section in adherent admin · 30837ed3
  Yvon authored Mar 06, 2024
  
  30837ed3 Browse Files
- Merge branch '5976-group-admin-see-presta-products' into 'ssa-gironde' · 61220dcf
```
show presta products in presta admin

See merge request cooperatic/kohinos-tav!67
```
  Yvon Kerdoncuff authored Mar 06, 2024
  61220dcf Browse Files
- presta products families : products fields turned into textarea and remove labels · 4d4abca6
  Damien Moulard authored Mar 06, 2024
  
  4d4abca6 Browse Files
- Merge branch '5972-explain-reconversion-frequency-for-presta' into 'ssa-gironde' · 4d623ac5
```
add help msg for prestataires to explain reconversion frequency

See merge request cooperatic/kohinos-tav!66
```
  Yvon Kerdoncuff authored Mar 06, 2024
  4d623ac5 Browse Files
- show presta products in presta admin · 5f3b56a7
  Damien Moulard authored Mar 06, 2024
  
  5f3b56a7 Browse Files