David Taylor
6862bb5721
Added start/end date validation for events
2015-06-29 22:16:50 +01:00
David Taylor
8ee76a9a75
Fixed testEventDetail
2015-06-28 19:02:18 +01:00
Tom Price
9c06f9f9f9
Remove uneeded linebreaks to make it easier to trace what is going on.
2015-05-31 23:04:59 +01:00
Tom Price
2da8980be4
Fix for postgres requring an explicit definition of what the output field type is with summing mixed fields
2015-05-29 15:59:08 +01:00
Tom Price
bc14c0e33e
Fix for changes to sum function
2015-05-29 15:42:57 +01:00
David Taylor
be7fe9ee9b
Added profile Modals & links from activity feed
2015-05-29 01:28:36 +01:00
Tom Price
ca3cae4af8
Change 'Collected by' to lowercase so it shows up correctly in the activity feed
...
Incidently, this is corrected by forms to have sentence case.
2015-05-29 00:19:25 +01:00
Tom Price
cb0151fd23
Change profile to use the correct user display name.
2015-05-29 00:12:26 +01:00
David Taylor
5f2fde3ecc
Made it work for other models
2015-05-23 14:57:29 +01:00
Tom Price
06515366df
Merged in purchase-order (pull request #23 )
...
Added PO field to event form #82
2015-04-24 15:13:15 +01:00
David Taylor
143f4ea454
Fixed midnight issues in ical, web calendar & event_table
2015-04-24 14:22:08 +01:00
David Taylor
d2cc9b8460
Changed to 'PO' and corrected capitalisation in 'Collected by'
2015-04-24 01:22:46 +01:00
David Taylor
4560be158a
Added PO field to event form
2015-04-23 23:58:54 +01:00
Tom Price
c7b0ca4334
Change ical to use dynamically generated URL's instead of a static base URL.
2015-04-21 19:25:46 +01:00
David Taylor
d2c95a46c4
Merge commit '0d719b328fd95504bdc6dabea96d65e5a485677b' into ics-interface
2015-04-20 15:19:25 +01:00
David Taylor
9f902eabb6
Made it work for users that already exist in database
2015-04-19 17:28:22 +01:00
David Taylor
f4ffb6f256
Added api key stuff to profile model
2015-04-19 17:06:03 +01:00
David Taylor
6dc101a961
Changed to wavatar default
2015-03-31 16:50:14 +01:00
Tom Price
9ac0326b4b
Change ordering for events to start_date first.
2015-03-30 19:59:24 +01:00
tomtom5152
cc85b44ba3
Add rig collected by information issue #25
2015-03-28 17:12:37 +00:00
tomtom5152
2a3875f198
Bug fix for non unicode in admin panel.
...
Add __str__ for Payments
2015-03-27 12:15:10 +00:00
tomtom5152
d70ad24c53
Bugfix for #27
2015-03-26 14:16:03 +00:00
Tom Price
64d6d134b6
Fixed syntax error in analytics.html
2015-03-13 15:28:34 +00:00
tomtom5152
2930f43937
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
50d34af428
Fix for #14
...
Removed reference to cost__gt=0 so discounts work.
2015-03-04 02:24:04 +00:00
root
ed660b9106
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
e1cef5bd87
Made raw queries portable to postgresql engine as well
2015-03-03 02:44:16 +00:00
Tom Price
472cc3f1bb
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
ff1d5730a2
Fixed issue with calculating the balance on an invoice
...
Improvements to the invoice importer
2015-02-09 17:48:59 +00:00
Tom Price
76939409bb
Increased query efficiency
2015-02-01 23:41:03 +00:00
Tom Price
d8cff2779f
Created invoice importer
...
Allowed payment method to be null
2015-01-31 23:13:09 +00:00
tomtom5152
a0e3f6bfc1
Added default value to Invoice.void (False)
2015-01-30 00:16:29 +00:00
tomtom5152
2ce45b9297
Basic working invoice system. Need to add a way to create invoices.
2015-01-29 23:18:04 +00:00
tomtom5152
1c29b9275d
Fixes for the selection of current rigs.
...
Added checked in field for dry hires
2015-01-28 16:30:32 +00:00
tomtom5152
ca1fd274e2
Improved the way current events is queried
2015-01-28 15:29:00 +00:00
Tom Price
6f27474a88
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
98ef7539e9
Improved person/organisation cross referencing via events
2015-01-22 22:06:24 +00:00
Tom Price
c6aed3db75
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
e2d01cc6c5
Fix for issue #5 . Added verbose name to Event.mic
2015-01-22 19:34:25 +00:00
Tom Price
c4a14e97c2
Fix for issue #4 . Changed edited by username to standard name format.
2015-01-22 19:31:43 +00:00
Tom Price
c47721a42c
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
b52da8c2c0
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
9e7e6dc707
Event Items now saved using JSON rather than an AJAX request
2014-12-04 22:18:53 +00:00
Tom Price
737d79ef48
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
b774fe0b37
Fix to current rig count
2014-11-06 03:40:50 +00:00
tomtom5152
9352733629
Working rigboard. Thank fuck...
2014-11-06 03:32:36 +00:00
tomtom5152
1afa6c4055
Fixed EventManger methods for Django 1.7
2014-11-06 03:02:16 +00:00
tomtom5152
df7ef7059f
Added EventManager and did some generic refactoring
2014-11-06 02:51:50 +00:00
tomtom5152
9b86cc5c66
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
e887878f03
Added Venue views, urls and templates
2014-11-05 23:01:15 +00:00