David Taylor
39d27d2730
Basic invoice UI improvements - closes #232
2016-07-10 10:49:23 +01:00
Tom Price
6030288956
Cheap and dirty active totals
2016-05-24 17:17:52 +01:00
Tom Price
6da688cc9e
Migrate VAT rate to use a single date field rather than datetime.
...
There is never any need to track the time as VAT rate hardly ever changes and will always do so at midnight. We were already assuming this anyway but it was generating loads of warnings/errors.
This will break your local VAT rate database if using sqlite, but it is tested with postgres and works fine.
2016-03-31 13:15:53 +01:00
Tom Price
0ee37b1cd3
Fix issues with python2 imports
2016-03-31 12:07:07 +01:00
David Taylor
a77bc65d7b
Changed delete condition to SET_NULL - closes #199
2016-02-29 20:12:41 +00:00
Tom Price
48969ed95c
Fix NoneType exception by only adding initials if they are set.
...
Closes #171
2015-12-22 23:03:30 +00:00
David Taylor
6944d98c4e
Added paperwork generation date, user & versioning
2015-07-29 22:06:44 +01:00
Tom Price
9bbdb9fbe0
Merge branch 'master' into web-calendar
2015-07-29 18:39:36 +01:00
Tom Price
5bb7283f2d
Merge branch 'vagrant' into hotfixes
2015-07-23 21:08:44 +01:00
David Taylor
160c43f927
Merge branch 'ui-changes'
2015-07-21 00:19:32 +01:00
David Taylor
72bf28da53
Removed special characters from paperwork filenames - issue #103
2015-06-29 23:27:10 +01:00
David Taylor
6862bb5721
Added start/end date validation for events
2015-06-29 22:16:50 +01:00
David Taylor
8450c36971
Fixed some #timezoneIssues
2015-06-29 21:07:10 +01:00
David Taylor
90ed1c9c1d
Added additional selectors to events_in_bounds
2015-06-29 20:28:09 +01:00
David Taylor
68e624f460
Streamlined web-calendar logic, also fixed issue #94
2015-06-29 20:25:46 +01:00
David Taylor
c27960456e
Merge branch 'hotfixes' into web-calendar
2015-06-29 19:40:01 +01:00
David Taylor
6b40123f63
Added earliest_time property to event
2015-06-29 19:39:24 +01:00
David Taylor
d3c6dab29b
Improved how events are selected for display on web-calendar
2015-06-29 14:42:53 +01:00
David Taylor
4c07298e5e
Rewrote UI for person and organisation detail pages - now matches design of event_detail and is generally much prettier. Also happens to fix issue #6
2015-06-29 02:25:53 +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
