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

142 Commits

Author SHA1 Message Date
Yohann D'ANELLO f81e2b5b5b Use custom inputs for date picker and amounts 2020-03-27 13:50:02 +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 2d18cb983f fee in cents for fixture and initial picture 2020-03-25 16:12:57 +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
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 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
Pierre-antoine Comby 33139bdbde Dynamic search of buttons 2020-03-24 00:07:25 +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 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
Yohann D'ANELLO b9fac82d89 Fixtures are more natural 2020-03-22 22:09:41 +01:00
Yohann D'ANELLO 3551568de5 Add remittance model 2020-03-22 17:29:31 +01:00
Yohann D'ANELLO 1e5065b80b Fixtures are more natural 2020-03-22 14:54:05 +01:00
Yohann D'ANELLO 70cf186233 Fix fixtures, another time... 2020-03-22 14:12:45 +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
Yohann D'ANELLO 1c6d69ab9d We store amounts in cents but users enter euros 2020-03-21 18:59:13 +01:00
Yohann D'ANELLO 091c427707 Restructurate code 2020-03-20 14:43:35 +01:00
Yohann D'ANELLO 02817c5626 Fix CI 2020-03-20 02:20:13 +01:00
Yohann D'ANELLO 3f2b21f7f4 Fix CI 2020-03-20 02:14:43 +01:00
Yohann D'ANELLO 0ce6cd88b3 More optimisation 2020-03-20 02:05:41 +01:00
Yohann D'ANELLO 6fc43e651e More optimisation 2020-03-20 01:46:59 +01:00
Yohann D'ANELLO 801f948a7d Rename TemplateTransaction into RecurrentTransaction 2020-03-19 20:37:48 +01:00
Yohann D'ANELLO 74c0fcca83 Notes are read-only in the API, but can be modified with scripts (ie. transactions) 2020-03-19 19:29:52 +01:00
Yohann D'ANELLO 7794210cc8 Being superuser is not enough (must have the correct mask), add some initial fixtures 2020-03-19 18:53:06 +01:00
Yohann D'ANELLO 95315cdbe2 Implements permission masks 2020-03-19 16:12:52 +01:00
Yohann D'ANELLO d083894e9b Fix note display for users that don't have enough rights 2020-03-19 14:25:43 +01:00
Yohann D'ANELLO 730d37c620 Protect views from viewing if the user has no right to view an object 2020-03-19 02:26:06 +01:00
Yohann D'ANELLO e461d70b14 Improve add permissions 2020-03-18 15:49:52 +01:00
Yohann D'ANELLO 057f42fdb6 Handle permissions (and it seems working!) 2020-03-18 14:42:35 +01:00
Yohann D'ANELLO 4909a7f09c Transaction types are now properties 2020-03-17 17:48:55 +01:00
Yohann D'ANELLO 7b98244360 Add transaction type field 2020-03-17 17:48:55 +01:00
Yohann D'ANELLO c42a7745bc Add most used buttons 2020-03-17 17:48:55 +01:00
Yohann D'ANELLO 717891869d Auto-complete first and last name for credits and debits 2020-03-17 17:48:55 +01:00
Yohann D'ANELLO 040bb27528 Credit/debit support 2020-03-17 17:48:55 +01:00
Benjamin Graillot 321927ba1e [note] tranfert --> transfer 2020-03-17 17:48:55 +01:00
Benjamin Graillot 49952355e6 [note] Added type property to transactions 2020-03-17 17:48:55 +01:00
Yohann D'ANELLO 5d15b8c613 Fix (de)validation of transactions 2020-03-17 17:48:55 +01:00
Yohann D'ANELLO cc5185b3ed (Un)validate transactions 2020-03-17 17:48:55 +01:00
Yohann D'ANELLO a1f7f8f5b7 Fixed alias research 2020-03-13 10:34:47 +01:00
Yohann D'ANELLO 8c795c38dc Minor fixes on consumptions page, research is now faster 2020-03-13 10:29:27 +01:00
Yohann D'ANELLO a1f8ef721a Minor fixes on consumptions page 2020-03-13 09:26:39 +01:00
Yohann D'ANELLO 7b69ffdefe Better transfers 2020-03-12 23:12:49 +01:00