ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity
562 Commits 20 Branches 4 Tags 27 MiB
Commit Graph

562 Commits

Author SHA1 Message Date
Yohann D'ANELLO 841d56d5b3 Merge remote-tracking branch 'origin/master' into activity 
# Conflicts:
#	note_kfet/urls.py
#	templates/base.html
 2020-03-27 00:32:22 +01:00
ynerant e8cbd46374 Merge branch 'remove-noteuser-fixture' into 'master' 
Something is wrong in the fixtures

See merge request bde/nk20!69
 2020-03-26 16:04:09 +01:00
Yohann D'ANELLO 01410d2b23 Store used aliases in transactions 2020-03-26 15:59:51 +01:00
Pierre-antoine Comby c41999422f Merge branch 'front_club' into 'master' 
Front club

See merge request bde/nk20!68
 2020-03-25 17:02:55 +01:00
Pierre-antoine Comby 02ba4b6db6 Merge branch 'tresorerie' into 'master' 
Tresorerie

See merge request bde/nk20!61
 2020-03-25 16:59:51 +01:00
Pierre-antoine Comby 826573f553 whitespaces compliance 2020-03-25 16:58:15 +01:00
Pierre-antoine Comby 2d18cb983f fee in cents for fixture and initial picture 2020-03-25 16:12:57 +01:00
Pierre-antoine Comby ff17f1e877 Club view should as good as profile ones 2020-03-25 16:11:44 +01:00
Yohann D'ANELLO 9a7f1bba21 Fix CI (no idea of why this error happened) 2020-03-25 00:39:40 +01:00
ynerant 57a01c48a8 Merge branch 'master' into 'tresorerie' 
# Conflicts:
#   apps/note/fixtures/initial.json
#   templates/base.html
 2020-03-25 00:30:14 +01:00
Yohann D'ANELLO 075cb1b592 Transaction can't be attached to a closed remittance 2020-03-25 00:25:24 +01:00
Pierre-antoine Comby 0ac94547d1 Merge branch 'manage_button' into 'master' 
Meilleurs vues pour la gestion des boutons

See merge request bde/nk20!54
 2020-03-25 00:17:34 +01:00
Pierre-antoine Comby f85f292d5b linter compliance 2020-03-25 00:12:56 +01:00
Pierre-antoine Comby 0411646ae6 make the CI pass and nicer front 2020-03-25 00:03:48 +01:00
Pierre-antoine Comby 20ea017e96 row color to show if display 2020-03-24 23:32:48 +01:00
Pierre-antoine Comby b3c1032f4f wrap in function for correct behavior 2020-03-24 23:27:08 +01:00
Pierre-antoine Comby 9be93db9af les boeufs avant la charrue, a faire sur une autre branche 2020-03-24 23:14:13 +01:00
Pierre-antoine Comby 9f53bda1cd clean code 2020-03-24 23:02:12 +01:00
Pierre-antoine Comby 41568916b8 error fixes 2020-03-24 22:28:03 +01:00
Pierre-antoine Comby ba04a6555f dynamically delete buttons 2020-03-24 22:12:59 +01:00
Yohann D'ANELLO 432f14d9d1 Product's amounts can be negative, in case of discounts (treasurers are free to generate what invoice they want) 2020-03-24 22:01:02 +01:00
Pierre-antoine Comby 8ab142c122 no need to be static after all 2020-03-24 20:25:08 +01:00
Yohann D'ANELLO a33d373f6e Comment code 2020-03-24 20:22:15 +01:00
Pierre-antoine Comby d4b8d35206 check permission with PermissionBackend. 
taking connection permission mask into account.
 2020-03-24 20:19:24 +01:00
Yohann D'ANELLO 093e585b79 We don't need to create proxies for special transactions that don't require a remittance 2020-03-24 17:14:29 +01:00
Yohann D'ANELLO 4cf1047faa Manage remittance types 2020-03-24 17:06:50 +01:00
Yohann D'ANELLO 1b03eac95b Last and first name didn't auto-complete because of a bug 2020-03-24 01:34:47 +01:00
Yohann D'ANELLO a52741b87f Add tabs (can be improved) 2020-03-24 01:12:22 +01:00
Yohann D'ANELLO d25d342d28 Update translations 2020-03-24 01:04:01 +01:00
Yohann D'ANELLO 5682c5489e Close remittances 2020-03-24 00:50:55 +01:00
Pierre-antoine Comby 33139bdbde Dynamic search of buttons 2020-03-24 00:07:25 +01:00
Yohann D'ANELLO 414722df18 Link transactions and remittances 2020-03-23 23:42:37 +01:00
Yohann D'ANELLO 95888ea316 Add some tables for special transactions 2020-03-23 22:43:16 +01:00
Yohann D'ANELLO 2defb04d52 Remove my own VPS DNS 2020-03-23 22:42:56 +01:00
Yohann D'ANELLO d6e00f7bba Fix SpecialTransaction proxies 2020-03-23 22:13:16 +01:00
Yohann D'ANELLO cf45b08c5b Automatically link SpecialTransactions and their proxies 2020-03-23 21:30:57 +01:00
Yohann D'ANELLO 884a7d0f08 Use a proxy for special transactions in treasury app for modularity (not a clean way, but without any other solution...) 2020-03-23 21:15:59 +01:00
Pierre-antoine Comby 7cd8a37aec non dynamic search for button 2020-03-23 20:21:25 +01:00
Pierre-antoine Comby 1ce7dc0118 reorganize tabs of nav bar 2020-03-23 15:53:18 +01:00
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
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