Thomas Flummer
aafe9de44e
added a bit more margin in the botton to prevent footer from covering stuff on mobile devices ( #282 )
...
fixes issue #228
2018-11-20 00:18:14 +01:00
Thomas Steen Rasmussen
16a838a3cf
upgrade django
2018-10-03 23:41:18 +02:00
Thomas Steen Rasmussen
348c73323d
make sure expense attachments open in a new window
2018-09-16 11:23:32 +02:00
Thomas Steen Rasmussen
794e905050
show both user and reimbursement_user for reimbursements
2018-09-13 14:09:17 +02:00
Thomas Steen Rasmussen
ffe2fc056a
show the correct name when creating reimbursement
2018-09-13 13:53:49 +02:00
Thomas Steen Rasmussen
3bd821373f
make CampRedirectView handle cases where there is no next or no previous camp with a bit more grace
2018-09-13 13:42:31 +02:00
Thomas Steen Rasmussen
1cd0551d5e
the amount of an expense can NOT be negative
2018-09-01 10:25:45 +02:00
Thomas Steen Rasmussen
4123c2eb91
clarify that expense amount can be negative
2018-09-01 09:56:22 +02:00
Víðir Valberg Guðmundsson
4c124a978d
Upgrade django to newest bugfix version
...
https://docs.djangoproject.com/en/2.1/releases/2.1.1/
2018-08-31 11:41:49 +02:00
Thomas Steen Rasmussen
ac54e4cb16
show unapproved expenses seperately in backoffice, crosslink expenses and reimbursements in list and detailviews on main page and in backoffice
2018-08-30 19:32:23 +02:00
Thomas Steen Rasmussen
698beaaffd
refactor email functionality into seperate functions in economy.email module
2018-08-30 17:54:31 +02:00
Thomas Steen Rasmussen
8d32170422
derive mimetype from attachment content rather than hardcoding application/pdf as we've done until now (we have non-pdf attachments going to economic now)
2018-08-30 17:32:24 +02:00
Thomas Steen Rasmussen
435f95b70b
only use base filename, not full path lol
2018-08-30 17:31:43 +02:00
Thomas Steen Rasmussen
b753d05b5c
include expense uuid in subject of email to economic
2018-08-30 15:22:23 +02:00
Thomas Steen Rasmussen
fca7bd3721
filter on reimbursement_user not user
2018-08-30 13:24:23 +02:00
Thomas Steen Rasmussen
b56b9c27b4
include the actual attachment when sending to e-conomic
2018-08-30 13:17:52 +02:00
Thomas Steen Rasmussen
db73051a23
enable admin for Reimbursement model
2018-08-30 13:17:34 +02:00
Thomas Steen Rasmussen
fc3a993547
do not show the expense which represents the actual reimbursement, and do not count it towards the total
2018-08-30 12:39:43 +02:00
Thomas Steen Rasmussen
93b0bff50b
permit PDF as well as images for invoice uploads for expenses
2018-08-30 12:18:56 +02:00
Thomas Steen Rasmussen
ed736938cc
small markup fix
2018-08-30 01:42:45 +02:00
Thomas Steen Rasmussen
4d6a69d50a
remove stray pk_url_kwarg
2018-08-30 01:40:39 +02:00
Thomas Steen Rasmussen
8b3e00d9d4
make it impossible for users to approve expenses they submitted themselves
2018-08-30 01:35:37 +02:00
Víðir Valberg Guðmundsson
b2fa1dc92c
WIP Reimbursement feature ( #278 )
...
* Almost done, need the send to economic part.
* Add a way to approve/reject an reimbursement and send mails accordingly.
* finish work on custom invoice address
* add textfield notes to Order for internal orga notes about the order
* Almost done, need the send to economic part.
* Add a way to approve/reject an reimbursement and send mails accordingly.
* economy commit of doom.. replace reimbursement app with an economy app, add Expense and Reimbursement models, add management of expenses and reimbursements to backoffice. Rework and cleanup permissions stuff, add Camp.Permissions pseudo model to hold all our non-model permissions. still experimental, expect rough edges, but basic functionality should work.
2018-08-30 00:52:32 +02:00
Thomas Steen Rasmussen
2c1e5f12fe
add textfield notes to Order for internal orga notes about the order
2018-08-27 12:44:53 +02:00
Thomas Steen Rasmussen
f396708156
finish work on custom invoice address
2018-08-27 11:52:42 +02:00
Víðir Valberg Guðmundsson
80e9c01f87
Merge pull request #277 from pwelzel/feature_custom_invoice_address
...
add custom address field to shop.models.Order and invoice template
2018-08-22 19:27:23 +02:00
Patrick Welzel
8b8191e16d
add custom address field to shop.models.Order and invoice template
2018-08-22 15:41:24 +02:00
Thomas Steen Rasmussen
af794e6a2f
fix dates for 2019
2018-08-22 14:32:10 +02:00
Víðir Valberg Guðmundsson
f7d17883be
Display feedback a bit better.
2018-08-22 12:59:53 +02:00
Víðir Valberg Guðmundsson
09e916571e
Use the existing event type if there is one and one is not defined.
2018-08-21 13:47:56 +02:00
Víðir Valberg Guðmundsson
f2b7ad63ca
Ooops.
2018-08-20 15:57:00 +02:00
Víðir Valberg Guðmundsson
98433be365
Should be a CampRelatedModel.
2018-08-20 15:52:11 +02:00
Víðir Valberg Guðmundsson
0aa198ba6c
Save it!
2018-08-20 15:39:08 +02:00
Víðir Valberg Guðmundsson
2d58695ee4
Adding feedback functionality.
2018-08-20 15:13:51 +02:00
Víðir Valberg Guðmundsson
d605abcb40
Use col-xs- instead of col-sm- to get a slightly better dayview.
2018-08-20 12:43:33 +02:00
Víðir Valberg Guðmundsson
2ef3c45bc1
Fix bootstrap script.
2018-08-19 19:52:00 +02:00
Víðir Valberg Guðmundsson
b871613d24
Fix proposal submission.
2018-08-19 19:52:00 +02:00
Thomas Steen Rasmussen
52d3e827c8
show a message when all tokens have been found
2018-08-19 18:53:40 +02:00
Thomas Steen Rasmussen
387e4c1d87
filter on the correct id
2018-08-19 18:48:48 +02:00
Thomas Steen Rasmussen
a6e12868b3
fix order of columns
2018-08-19 18:35:40 +02:00
Thomas Steen Rasmussen
f408b0955a
add missing <tr> tags
2018-08-19 18:33:31 +02:00
Thomas Steen Rasmussen
fe4fdd06b0
show missing tokens, and show category/hint
2018-08-19 18:30:25 +02:00
Thomas Steen Rasmussen
df34d3edf3
add category field, and add unique_together constraint to TokenFind model until I figure out why it is creating duplicates
2018-08-19 17:56:04 +02:00
Víðir Valberg Guðmundsson
97ba725ba2
Add missing migrations.
2018-08-19 17:40:33 +02:00
Thomas Steen Rasmussen
62d172f6c2
add secret token to base.html
2018-08-19 16:22:02 +02:00
Víðir Valberg Guðmundsson
014e962a3f
use .get because it might not be there.
2018-08-19 00:06:25 +02:00
Víðir Valberg Guðmundsson
b50f368dea
Add a slides field to talk and lightning talk forms.
2018-08-18 20:43:24 +02:00
Víðir Valberg Guðmundsson
c8f6f76689
Make email mandatory and show that on the event proposal admin site.
2018-08-18 20:04:15 +02:00
Víðir Valberg Guðmundsson
428cee3cd7
Making event proposal admin slightly better.
2018-08-18 20:04:15 +02:00
Thomas Steen Rasmussen
7dd52c78ee
make the colours more visible on the camp list page, set camp colours in bootstrap script, add a light_text property to Camp model
2018-08-18 17:45:33 +02:00
Víðir Valberg Guðmundsson
