Commit Graph

1974 Commits

Author SHA1 Message Date
Pierre-antoine Comby 4e17b50e35 Merge branch 'master' into manage_button 2020-03-23 15:40:01 +01:00
Pierre-antoine Comby 41a0529d0c fixin the merge... 2020-03-23 15:35:24 +01:00
Pierre-antoine Comby bbda99a3ac Merge branch 'master' into manage_button 2020-03-23 15:31:39 +01:00
Pierre-antoine Comby 3cdb3f6d38 Refactor and comment noteView 2020-03-23 15:28:09 +01:00
Benjamin Graillot a4cb19e5b1 [member] Added parent_club field to Club 2020-03-23 09:07:39 +01:00
Pierre-antoine Comby 05d8b3bc69 Merge branch 'tranfer_front' into 'master'
show Note info always on left

See merge request bde/nk20!64
2020-03-22 22:39:50 +01:00
Pierre-antoine Comby 610a4f0b3f show Note info always on left 2020-03-22 22:35:07 +01:00
Pierre-antoine Comby 4533d928da Merge branch 'fix_login' into 'master'
Fix login

See merge request bde/nk20!63
2020-03-22 22:27:59 +01:00
Pierre-antoine Comby da63bd75f1 this is not the place for cas config 2020-03-22 22:22:51 +01:00
Pierre-antoine Comby c295e5cbc7 fix indentation 2020-03-22 22:22:37 +01:00
Pierre-antoine Comby c3bea59f2f update script projects 2020-03-22 22:09:45 +01:00
Yohann D'ANELLO b9fac82d89 Fixtures are more natural 2020-03-22 22:09:41 +01:00
Pierre-antoine Comby c200ae8c3c ask for cas only if available. 2020-03-22 22:01:33 +01:00
Yohann D'ANELLO 5fd472d408 Create, view and update remittances 2020-03-22 18:27:22 +01:00
Yohann D'ANELLO 3551568de5 Add remittance model 2020-03-22 17:29:31 +01:00
Yohann D'ANELLO 5ac10b58d5 API Support (useless, but...) 2020-03-22 16:04:09 +01:00
Yohann D'ANELLO d641b4cc1c Can't change which BDE has editted the invoice 2020-03-22 15:33:48 +01:00
Yohann D'ANELLO 15bfdd9f96 Repair Invoice model 2020-03-22 15:24:54 +01:00
Pierre-antoine Comby 8717581e9d Merge branch 'fix_submodule' into 'master'
add submodule

See merge request bde/nk20!62
2020-03-22 15:03:00 +01:00
Yohann D'ANELLO f6027e9edd Fix CI 2020-03-22 14:57:51 +01:00
Pierre-antoine Comby 28e7707bc5 add submodule 2020-03-22 14:57:49 +01:00
Yohann D'ANELLO 1e5065b80b Fixtures are more natural 2020-03-22 14:54:05 +01:00
Yohann D'ANELLO c941585850 Fix production installation 2020-03-22 14:15:19 +01:00
Yohann D'ANELLO 70cf186233 Fix fixtures, another time... 2020-03-22 14:12:45 +01:00
Yohann D'ANELLO 4f343fc99f Billing -> Invoice 2020-03-22 01:22:27 +01:00
Yohann D'ANELLO 18f6daf2ac Merge remote-tracking branch 'origin/master' into tresorerie
# Conflicts:
#	locale/de/LC_MESSAGES/django.po
#	locale/fr/LC_MESSAGES/django.po
#	note_kfet/settings/base.py
#	templates/base.html
2020-03-22 01:04:03 +01:00
Pierre-antoine Comby 3556672ed9 Merge branch 'rights' into 'master'
Système de droits

See merge request bde/nk20!10
2020-03-22 00:04:55 +01:00
Pierre-antoine Comby 6445acedc7 Merge branch 'master' into rights 2020-03-22 00:00:18 +01:00
Pierre-antoine Comby 0ecef74a1c Merge branch 'consos' into 'master'
Page de consommations

Closes #21

See merge request bde/nk20!57
2020-03-21 23:18:24 +01:00
Pierre-antoine Comby c87006e018 Merge branch 'documentation' into 'master'
Documentation logs middleware

See merge request bde/nk20!60
2020-03-21 20:40:33 +01:00
Pierre-antoine Comby 1031912899 Merge branch 'fix_install' into 'master'
Fix install

See merge request bde/nk20!59
2020-03-21 20:38:07 +01:00
Yohann D'ANELLO 1c6d69ab9d We store amounts in cents but users enter euros 2020-03-21 18:59:13 +01:00
Yohann D'ANELLO a220ca7549 We need the french latex package 2020-03-21 17:54:08 +01:00
Yohann D'ANELLO 2d0ba4750c Fix CI 2020-03-21 17:29:39 +01:00
Yohann D'ANELLO b3bc30b72b LaTeX is now a requirement (if we want to use the treasury app) 2020-03-21 17:21:28 +01:00
Yohann D'ANELLO 086bb967d5 Update translations 2020-03-21 17:02:28 +01:00
Yohann D'ANELLO a772cea760 Add products on billings 2020-03-21 16:49:18 +01:00
Yohann D'ANELLO 02ac33d143 Render billings 2020-03-21 09:22:38 +01:00
Yohann D'ANELLO 8ecaef0daf Add render button 2020-03-21 07:36:07 +01:00
Yohann D'ANELLO b030f5797f Create & update billings (products are not yet supported) 2020-03-21 00:52:26 +01:00
Yohann D'ANELLO 1c12494a67 Register the BDE in billings 2020-03-21 00:41:55 +01:00
Yohann D'ANELLO 71346476df Starting treasury app 2020-03-21 00:30:49 +01:00
Pierre-antoine Comby 8023e2f48c fix CI 2020-03-20 21:01:33 +01:00
Pierre-antoine Comby 93c583f5c6 remove api deps, moved to base 2020-03-20 20:51:15 +01:00
Pierre-antoine Comby 9786a2250e config requirements 2020-03-20 20:46:44 +01:00
Pierre-antoine Comby e5cc16569d api is a base requirement 2020-03-20 20:44:34 +01:00
Pierre-antoine Comby fa5334a741 use the OPTIONALS_APPS from secrets.py 2020-03-20 20:40:26 +01:00
Yohann D'ANELLO e2d2d2cc99 Anonymous users have no right 2020-03-20 18:23:20 +01:00
Yohann D'ANELLO d494a3e7fa Quality assurance 2020-03-20 18:13:34 +01:00
Yohann D'ANELLO 93bd8489df Amounts are in cents... 2020-03-20 18:02:12 +01:00