Commit graph

2419 commits

Author SHA1 Message Date
Thomas Steen Rasmussen 3ca3631136 upgrade django, hax 2019-01-21 23:22:30 +01:00
Thomas Steen Rasmussen 58f3035927 switch from ws:// to wss:// 2019-01-21 20:06:52 +01:00
Thomas Steen Rasmussen b8fb36d346 add reimbursement_user to description of expense 2019-01-20 17:15:33 +01:00
Thomas Steen Rasmussen c93b38a98b make invoice_date a datefield not a datetimefield 2019-01-20 16:42:50 +01:00
Thomas Steen Rasmussen d14708bee1 add invoice_date to django admin list display 2019-01-20 15:58:10 +01:00
Thomas Steen Rasmussen 51f8854a6c show user on expense and revenue list and detail views 2019-01-20 15:50:54 +01:00
Thomas Steen Rasmussen 864a7e6673 add invoice_date to revenue and expense forms and templates 2019-01-20 15:39:59 +01:00
Thomas Steen Rasmussen e8edb24233 add invoice_date field to Expense and Revenue models 2019-01-20 15:33:05 +01:00
Thomas Steen Rasmussen 29c468ab4a show 2018 and 2019 in the camp menu dropdown 2019-01-20 09:47:47 +01:00
Thomas Steen Rasmussen 090a3b1e28 show both users on reimbursements 2019-01-20 09:38:18 +01:00
Thomas Steen Rasmussen b4698f3fdc fix case sensitive irc channel uniqueness check 2019-01-19 14:22:30 +01:00
Thomas Steen Rasmussen 1b9566ee02 make channel uniqueness check case insensitive 2019-01-19 13:49:51 +01:00
Thomas Steen Rasmussen acfe658ab6 update location on frontpage 2019-01-13 17:21:57 +01:00
Thomas Steen Rasmussen 5e95133267 update help_text on a reimbursement field, and count reimbursement total with the right user field 2018-11-20 18:36:06 +01:00
Thomas Steen Rasmussen 733731ecf9 take camp into account when showing economy stats 2018-11-20 18:14:16 +01:00
Thomas Steen Rasmussen fd1850dd98 use psycopg2-binary and close #271 2018-11-20 17:24:19 +01:00
Thomas Steen Rasmussen a057bd6464
Revenue and economy revamp (#285)
* rework economy stuff, add revenue model, unfinished code!

* part 2 of economy overhaul. add views for dealing with revenue. rework expense views.
2018-11-20 17:12:32 +01:00
Thomas Steen Rasmussen a8051783cb upgrade requests due to vulnerability 2018-11-20 17:11:50 +01:00
Thomas Steen Rasmussen 9f28435256 upgrade django 2018-11-20 01:09:27 +01:00
Víðir Valberg Guðmundsson 0a81a88e93 Introduce wrapt and monkeypatch django.views.View so we have a setup method to override. (#279) 2018-11-20 00:22:43 +01:00
Thomas Flummer 9b2640ea07 changed sponsor logo to be filename only (#280)
* changed sponsor logo to be filename only

fixes issue #151

* changed to load logo correctly on sponsor tickets

related to fix of issue #151
2018-11-20 00:20:37 +01:00
Thomas Flummer 95cd376f36 added danish bank transfer info (#281)
fixes issue #237
2018-11-20 00:19:32 +01:00
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 Flummer 9f824ae11a added a bit of information for setting up on macOS (#283) 2018-11-20 00:17:17 +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