Yohann D'ANELLO
|
691a03ecad
|
Add some initial permissions for activities
|
2020-03-28 19:05:21 +01:00 |
|
Yohann D'ANELLO
|
c8b72cf1ff
|
Guests can pay with CB or coins, lot of other improvements
|
2020-03-28 16:52:58 +01:00 |
|
Yohann D'ANELLO
|
81cfaf12fa
|
People can join activities
|
2020-03-28 13:38:31 +01:00 |
|
Yohann D'ANELLO
|
a8422411bc
|
Entry page (we can search people)
|
2020-03-28 01:45:13 +01:00 |
|
Yohann D'ANELLO
|
8c1d902c30
|
Open and validate activities
|
2020-03-27 22:48:20 +01:00 |
|
Yohann D'ANELLO
|
d6e202a26f
|
Display guests list
|
2020-03-27 21:18:27 +01:00 |
|
Yohann D'ANELLO
|
0d43d74c60
|
Display activity details
|
2020-03-27 19:47:43 +01:00 |
|
Yohann D'ANELLO
|
ceb5690838
|
Invite people
|
2020-03-27 18:02:22 +01:00 |
|
Yohann D'ANELLO
|
f09364d3d8
|
Custom auto-complete fields, remove DAL requirement
|
2020-03-27 16:19:33 +01:00 |
|
Yohann D'ANELLO
|
dadd840645
|
Merge remote-tracking branch 'origin/master' into activity
|
2020-03-27 14:16:10 +01:00 |
|
Pierre-antoine Comby
|
09fb0e1470
|
Merge branch 'master' into front_club
|
2020-03-27 14:07:22 +01:00 |
|
Pierre-antoine Comby
|
ee3d441a56
|
add parent club link
|
2020-03-27 14:04:30 +01:00 |
|
Yohann D'ANELLO
|
f81e2b5b5b
|
Use custom inputs for date picker and amounts
|
2020-03-27 13:50:02 +01:00 |
|
Yohann D'ANELLO
|
45b14ed1bd
|
Create activities
|
2020-03-27 01:31:54 +01:00 |
|
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 |
|
Pierre-antoine Comby
|
f7a66920e0
|
move common script to alias.js
|
2020-03-26 23:05:08 +01:00 |
|
Pierre-antoine Comby
|
e125601f52
|
almost working javascript
|
2020-03-26 17:48:17 +01:00 |
|
Pierre-antoine Comby
|
04b39f09af
|
remove forms
|
2020-03-26 17:45:49 +01:00 |
|
Pierre-antoine Comby
|
7568abb681
|
some minor cleaning
|
2020-03-26 17:41:11 +01:00 |
|
Pierre-antoine Comby
|
33e3657120
|
add aliases view to clubs
|
2020-03-25 18:00:40 +01:00 |
|
Pierre-antoine Comby
|
a41e51e23a
|
add member get side information
|
2020-03-25 17:42:54 +01:00 |
|
Pierre-antoine Comby
|
26d70c4ef9
|
page title and edit buttons
|
2020-03-25 17:25:44 +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
|
ff17f1e877
|
Club view should as good as profile ones
|
2020-03-25 16:11:44 +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
|
0411646ae6
|
make the CI pass and nicer front
|
2020-03-25 00:03:48 +01:00 |
|
Pierre-antoine Comby
|
b3c1032f4f
|
wrap in function for correct behavior
|
2020-03-24 23:27:08 +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 |
|
Yohann D'ANELLO
|
a33d373f6e
|
Comment code
|
2020-03-24 20:22:15 +01:00 |
|
Yohann D'ANELLO
|
a52741b87f
|
Add tabs (can be improved)
|
2020-03-24 01:12:22 +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 |
|
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
|
bbda99a3ac
|
Merge branch 'master' into manage_button
|
2020-03-23 15:31:39 +01:00 |
|
Pierre-antoine Comby
|
610a4f0b3f
|
show Note info always on left
|
2020-03-22 22:35:07 +01:00 |
|
Pierre-antoine Comby
|
c295e5cbc7
|
fix indentation
|
2020-03-22 22:22:37 +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
|
15bfdd9f96
|
Repair Invoice model
|
2020-03-22 15:24:54 +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 |
|
Yohann D'ANELLO
|
1c6d69ab9d
|
We store amounts in cents but users enter euros
|
2020-03-21 18:59:13 +01:00 |
|
Yohann D'ANELLO
|
a772cea760
|
Add products on billings
|
2020-03-21 16:49:18 +01:00 |
|