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
tomtom5152
b46c0867ed
Template improvements to registration form
2015-03-26 13:51:35 +00:00
tomtom5152
4002206fa9
Bug fix for #27
2015-03-26 13:44:50 +00:00
tomtom5152
56979fa81a
Bug fix for #23
2015-03-26 13:19:47 +00:00
Tom Price
7fdeeec9d5
Minor improvement to tracking code.
...
Updated the userid tracking to better match the documentation
Added linkid tracking to analytics.html
2015-03-13 15:43:08 +00:00
Tom Price
8aeeb31491
Fixed syntax error in analytics.html
2015-03-13 15:28:34 +00:00
tjp03u
52fb9e17fe
Added analytics code.
2015-03-11 14:57:33 +00:00
tomtom5152
3ce01e79c5
Readded start>end checking. Template improvements
...
Added descritpions of all error for the user as well as the image.
Added contextual alert boxes for messages in base.
If start>end start<=>end. Very simple fix, thanks Charlie.
2015-03-05 18:20:43 +00:00
tomtom5152
7f0ef83f1c
Removed logic for the exception of start > end. This didn't add anything to UX so will need to find a better way of doing this. Ultimately, saying that there are no events available IS the correct response.
2015-03-05 15:11:23 +00:00
tomtom5152
7ede9b566b
Added error message for start > end
2015-03-04 16:08:36 +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
tomtom5152
0a54a1f2e3
Slight bugfix for 3e1fa4b with incorrect logic.
2015-03-04 03:11:54 +00:00
tomtom5152
a5be8aa38b
Potential fix for #12 .
...
Added a clause where if there was a balance balance, and no payments, it would still show up.
2015-03-04 03:06:43 +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
bab8b98db3
Merge remote-tracking branch 'origin/master'
...
Conflicts:
RIGS/finance.py
RIGS/models.py
2015-03-03 02:44:50 +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
4408b4afdc
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:20:07 +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
61f474fb70
Made entire importer atomic for consistency.
...
Dispatched as much as possible to sub-processes
Added "make this go away" feature to the invoice importer for invoices older than a year.
2015-02-01 23:42:41 +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
b527a3faa9
Fixed incorrect url on bootstrap fonts.
...
Fixed missing static files in repo
2015-01-30 13:47:56 +00:00
tomtom5152
20264f570a
Added the ability to invoice an event
2015-01-30 00:27:02 +00:00
tomtom5152
6606408f48
Added more invoice buttons
2015-01-30 00:25:45 +00:00
tomtom5152
f841cc886a
Enabled invoices button
2015-01-30 00:22:48 +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
8d9a0ee124
Merge remote-tracking branch 'origin/master'
2015-01-29 20:02:40 +00:00
tomtom5152
6c322e39cb
Started making use of gravatar icons.
2015-01-29 20:02:18 +00:00
tomtom5152
6aaae0d69e
Started making use of gravatar icons.
2015-01-29 20:00:07 +00:00
root
6838444501
Fixed display issue with the base template
2015-01-29 18:46:21 +00:00
root
1ad47107c1
Added setting user passwords to uuid4 so forgotten password should work
2015-01-29 16:04:19 +00:00
tomtom5152
4d667b64a4
Fixed added the ability to import
2015-01-28 18:45:40 +00:00
tomtom5152
d9e8e4d03f
Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs
2015-01-28 16:59:54 +00:00
tomtom5152
e24a95ec7a
Added missing fields to event form and detail
2015-01-28 16:49:10 +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
root
1e16542747
Fixes for the importer
2015-01-28 16:28:59 +00:00
tomtom5152
df67788865
Improved the way current events is queried
2015-01-28 15:29:00 +00:00
root
f5f4770247
Updated some email settings to be used in production
2015-01-27 16:56:46 +00:00
tomtom5152
ce3536714e
Minor fix for importer adding @nottingham.ac.uk to empty emails.
...
Small test case for email fixer to make sure that emails are fixed correctly.
2015-01-27 16:51:58 +00:00
tomtom5152
47e67e4c94
Fixed some dependency version issues.
2015-01-27 16:43:12 +00:00
root
ea9803f70a
Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs
...
Merge in requirements error fix
2015-01-27 01:06:09 +00:00
root
a4c824fc6a
Fixed typo in z3c.rlm -> z3c.rml
2015-01-27 01:01:46 +00:00
Tom Price
4a908fd95f
Added archive link
...
Added legacy redirect urls
2015-01-26 16:09:22 +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
c4bb7fbee6
Everyone's favourite, past events, now working and loading in ~800ms
2015-01-26 15:06:39 +00:00
Tom Price
93feaaf334
Corrected permissions to duplicate a rig
2015-01-26 11:11:11 +00:00
