ynerant
|
bef4958759
|
Merge branch 'master' into 'devalidation_reason'
# Conflicts:
# locale/de/LC_MESSAGES/django.po
# locale/fr/LC_MESSAGES/django.po
|
2020-03-27 13:52:48 +01:00 |
Pierre-antoine Comby
|
e27b456aea
|
Merge branch 'parent-club' into 'master'
Resolve "Club Parent"
Closes #42
See merge request bde/nk20!65
|
2020-03-27 13:29:43 +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 |
Yohann D'ANELLO
|
41aa6964d2
|
Store used aliases in transactions
|
2020-03-26 14:45:48 +01:00 |
Benjamin Graillot
|
59cd166b79
|
[member] tabs --> spaces
|
2020-03-25 18:05:46 +01:00 |
Benjamin Graillot
|
c86ddf17ad
|
[member] Check membership of parent club
|
2020-03-25 17:54:28 +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
|
5cf75ebf9e
|
When a transaction can't becreated because the user don't have the permission to take too much money, then we create an invalid transaction
|
2020-03-25 15:27:38 +01:00 |
Yohann D'ANELLO
|
bc3fdbe7a7
|
Add docstring
|
2020-03-25 14:54:26 +01:00 |
Yohann D'ANELLO
|
e5ab391236
|
Better user interface
|
2020-03-25 14:50:21 +01:00 |
Yohann D'ANELLO
|
23db42e448
|
Give a reason when a transaction is invalidated
|
2020-03-25 13:13:01 +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 |