Commit Graph

58 Commits

Author SHA1 Message Date
Tom Price
0ffb79c7e8 Merged in purchase-order (pull request #23)
Added PO field to event form #82
2015-04-24 15:13:15 +01:00
David Taylor
e48619c15a Fixed midnight issues in ical, web calendar & event_table 2015-04-24 14:22:08 +01:00
David Taylor
937f7e2f1c Changed to 'PO' and corrected capitalisation in 'Collected by' 2015-04-24 01:22:46 +01:00
David Taylor
2b79b17fbf Added PO field to event form 2015-04-23 23:58:54 +01:00
Tom Price
2cfeb49ea0 Change ical to use dynamically generated URL's instead of a static base URL. 2015-04-21 19:25:46 +01:00
David Taylor
57b2fd5a69 Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' into ics-interface 2015-04-20 15:19:25 +01:00
David Taylor
f40cfa7490 Made it work for users that already exist in database 2015-04-19 17:28:22 +01:00
David Taylor
df88222e00 Added api key stuff to profile model 2015-04-19 17:06:03 +01:00
David Taylor
80e8efc763 Changed to wavatar default 2015-03-31 16:50:14 +01:00
Tom Price
e212109a7a Change ordering for events to start_date first. 2015-03-30 19:59:24 +01:00
tomtom5152
ff0d703af5 Add rig collected by information issue #25 2015-03-28 17:12:37 +00:00
tomtom5152
7977b6a17c Bug fix for non unicode in admin panel.
Add __str__ for Payments
2015-03-27 12:15:10 +00:00
tomtom5152
534d82a7df Bugfix for #27 2015-03-26 14:16:03 +00:00
Tom Price
8aeeb31491 Fixed syntax error in analytics.html 2015-03-13 15:28:34 +00:00
tomtom5152
4ba308357c Fix for #9
Added ORDER BY statement to the invoice page.
Ordered all other invoice pages.
2015-03-04 15:49:00 +00:00
root
920f937c59 Fix for #14
Removed reference to cost__gt=0 so discounts work.
2015-03-04 02:24:04 +00:00
root
4247351253 Reverted to using Django ORM for the calculation of event totals and payment totals on an invoice.
Need to pay closer attention to the docs which state that the SUM(arg[0], fields) arg[0] is the returned type.
2015-03-03 17:29:38 +00:00
Tom Price
31d246fb27 Made raw queries portable to postgresql engine as well 2015-03-03 02:44:16 +00:00
Tom Price
2456092da5 Changed the calculations of sum totals to be raw SQL queries for speed boost. Not ideal but the best we are going to get.
Changed outstanding invoice to a raw SQL query for a speed boost. Average load now ~3.5s with ~10 invoices
2015-03-03 02:43:57 +00:00
Tom Price
c928f41e03 Fixed issue with calculating the balance on an invoice
Improvements to the invoice importer
2015-02-09 17:48:59 +00:00
Tom Price
3dc856c489 Increased query efficiency 2015-02-01 23:41:03 +00:00
Tom Price
e00a8771cc Created invoice importer
Allowed payment method to be null
2015-01-31 23:13:09 +00:00
tomtom5152
a0cf841d91 Added default value to Invoice.void (False) 2015-01-30 00:16:29 +00:00
tomtom5152
b1b5906038 Basic working invoice system. Need to add a way to create invoices. 2015-01-29 23:18:04 +00:00
tomtom5152
41bd6bc384 Fixes for the selection of current rigs.
Added checked in field for dry hires
2015-01-28 16:30:32 +00:00
tomtom5152
df67788865 Improved the way current events is queried 2015-01-28 15:29:00 +00:00
Tom Price
5b1cdbf182 Performance optimisation of the related models by letting the DB deal with the relation straight off 2015-01-26 15:19:37 +00:00
Tom Price
941bd2319e Improved person/organisation cross referencing via events 2015-01-22 22:06:24 +00:00
Tom Price
ff9bca1e61 Moved the table element from the main rigboard out to something reusuable.
Added the ability to view organisations by people and vice versa, as well as the option to see all the rigs associated with orgs/people/venues.

Added helper properties for the above
2015-01-22 20:48:37 +00:00
Tom Price
346c05759a Fix for issue #5. Added verbose name to Event.mic 2015-01-22 19:34:25 +00:00
Tom Price
387a7566c7 Fix for issue #4. Changed edited by username to standard name format. 2015-01-22 19:31:43 +00:00
Tom Price
d775a02758 Untested changes to models and adding a new finance system. Cannot test
ATM so will do so ASAP.
2015-01-21 16:38:02 +00:00
Tom Price
ea61bda578 Changes to importer:
Added delete method to all importers
Added nonrig importing
Venue import optimisation

Reran importer for empty DB
Reset password appropriately

Added view permission to all models where needed.
Migrated DB to reflect.

Fixed all print buttons on event detail.
2014-12-08 02:42:18 +00:00
Tom Price
697bbb9479 Event Items now saved using JSON rather than an AJAX request 2014-12-04 22:18:53 +00:00
Tom Price
3aec6c212d Enabled event create button
Added MIC field to the event form

Added the ability to specify the fields you want to query in an api request

Changes to the user profile to enable queries via the API
2014-12-02 01:24:38 +00:00
tomtom5152
6cbf77fcb4 Fix to current rig count 2014-11-06 03:40:50 +00:00
tomtom5152
c62c41b06f Working rigboard. Thank fuck... 2014-11-06 03:32:36 +00:00
tomtom5152
3f5cc920cb Fixed EventManger methods for Django 1.7 2014-11-06 03:02:16 +00:00
tomtom5152
98b4f92393 Added EventManager and did some generic refactoring 2014-11-06 02:51:50 +00:00
tomtom5152
2c8b159a84 Created VatRateManager to help find correct VAT Rates
Added necessary properties to Event for rendering in templates
2014-11-06 02:37:10 +00:00
tomtom5152
802bd8d336 Added Venue views, urls and templates 2014-11-05 23:01:15 +00:00
tec
e1fef479af Minor changes to models and importer 2014-11-05 22:37:32 +00:00
tomtom5152
55b7a1351b Added EventCrew model
Added collector to Event
2014-11-05 22:25:56 +00:00
tomtom5152
6359a7d37a Added Venue, Event and EventItem models 2014-11-05 19:34:36 +00:00
tomtom5152
11bc3e6642 Fixed issues with __unicode__() becoming __str__() in Python 3.
Fixed recursion issue with VatRate
2014-11-05 16:50:10 +00:00
tomtom5152
77a9a54cff Changed models.VatRate.__unicode__() to show as a percentage instead 2014-11-05 16:32:25 +00:00
tec
96805322de Fixed issues with importer and datetime conversion
Fixed issue with models.VatRate.__unicode__() with datetime and decimal fields

Imported VatRates
2014-11-05 16:26:27 +00:00
tomtom5152
1a0012c649 Add VAT Rates to modes, migrations and importer 2014-11-05 16:17:45 +00:00
tomtom5152
815b3989c4 Renamed model variable to be compliant with Django standards 2014-11-05 15:53:54 +00:00
Adam Bergen
dbe3961b56 Removed unecessary for loop. Changed registration complete text. Profile model changes. 2014-11-04 16:33:23 +00:00