Commit Graph

77 Commits

Author SHA1 Message Date
Tom Price
d1b351a201 README.md edited online with Bitbucket 2014-11-07 03:12:50 +00:00
Tom Price
f8a98ed4ef README.md edited online with Bitbucket 2014-11-07 03:04:10 +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
16c764ad11 Minor DB migrations 2014-11-06 02:54:29 +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
tec
5b34029dcd Imported EventItem 2014-11-06 02:17:57 +00:00
tomtom5152
a31ecd3f60 Added EventItem import 2014-11-06 02:06:39 +00:00
tec
bcea38e1ce Event import tk2 2014-11-06 01:48:37 +00:00
tomtom5152
5fa13d8e45 Truncate RIGS_event 2014-11-06 01:45:12 +00:00
tec
beb0e84577 Fixed event importer and imported 2014-11-06 01:29:12 +00:00
tomtom5152
73cdacfddd Added rig importer (beta) 2014-11-06 00:54:13 +00:00
tomtom5152
312b2f9565 Whole heap of registration and error template changes 2014-11-06 00:53:53 +00:00
tomtom5152
17a7252a5b Slight change making emails work on the console 2014-11-06 00:11:04 +00:00
tec
376a92b13a More database things 2014-11-05 23:41:58 +00:00
tomtom5152
22dbed4eb8 Database things 2014-11-05 23:41:18 +00:00
tec
127db5d565 Minor fixes to importer
Imported users
2014-11-05 23:35:55 +00:00
tomtom5152
047e3f77c4 Added debug info to user import 2014-11-05 23:29:14 +00:00
tomtom5152
c81d01b796 Started work on user importing.
RENAMED EXISTING USERS TO PREVENT CONFLICTS
2014-11-05 23:27:33 +00:00
tomtom5152
1a57535695 Changed finance links 2014-11-05 23:14:24 +00:00
tomtom5152
258aa02d58 Detail template improvements 2014-11-05 23:11:26 +00:00
tomtom5152
3a52319da7 Added menu links for Person, Organisation and Venue listings 2014-11-05 23:04:51 +00:00
tomtom5152
e887878f03 Added Venue views, urls and templates 2014-11-05 23:01:15 +00:00
tomtom5152
068a255a1c URL fail fix 2014-11-05 22:57:52 +00:00
tomtom5152
ac34977ddd Fixed a slight issue with string formatting in import_venue 2014-11-05 22:44:02 +00:00
tec
780f1ac5bc Fixed importer with Venue model 2014-11-05 22:41:40 +00:00
tec
9a3ac464f4 Minor changes to models and importer 2014-11-05 22:37:32 +00:00
tomtom5152
85b6004dda Merge remote-tracking branch 'origin/master' 2014-11-05 22:27:57 +00:00
tomtom5152
61fb27dc84 Added EventCrew model
Added collector to Event
2014-11-05 22:25:56 +00:00
tomtom5152
3cad695180 Added EventCrew model
Added collector to Event
2014-11-05 22:20:16 +00:00
tomtom5152
8c38091247 Added ability to delete all venues before improt 2014-11-05 19:49:47 +00:00
tomtom5152
d9ba90ca1e Added venue to importer 2014-11-05 19:43:30 +00:00
tomtom5152
e2a60a5fde Added Venue, Event and EventItem models 2014-11-05 19:34:36 +00:00
tomtom5152
711dbcaa7f Refactored some views to make it more consistent with Django internal namings 2014-11-05 16:57:31 +00:00
tomtom5152
c9fd7c0ad6 Added Person, Organisation and VatRate to admin section with reversion support 2014-11-05 16:50:55 +00:00
tomtom5152
d79b9fec9c Fixed issues with __unicode__() becoming __str__() in Python 3.
Fixed recursion issue with VatRate
2014-11-05 16:50:10 +00:00
tomtom5152
a4e1856dd4 Changed models.VatRate.__unicode__() to show as a percentage instead 2014-11-05 16:32:25 +00:00
tec
3fbb44a5ad 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
1bf5cbaf82 Add VAT Rates to modes, migrations and importer 2014-11-05 16:17:45 +00:00
tomtom5152
8713accf7d Merge remote-tracking branch 'origin/master' 2014-11-05 16:07:48 +00:00
tomtom5152
5921c01ef1 Updated organisation templates.
Render improvements to forms

Fixed organisation url
2014-11-05 16:07:24 +00:00
tomtom5152
d2b298ffbd Updated organisation templates.
Render improvements to forms

Fixed organisation url
2014-11-05 15:57:34 +00:00
tomtom5152
89e30a1d3a Renamed model variable to be compliant with Django standards 2014-11-05 15:53:54 +00:00
tec
60f8694c0c Reimported organisations 2014-11-05 15:37:23 +00:00
tomtom5152
21530b978a Added organisation things. Need to do the form. Committing to push and pull onto server with access to legacy database. 2014-11-05 15:22:50 +00:00
tomtom5152
046683ee5b Added .gitignore 2014-11-05 14:11:58 +00:00
tomtom5152
c624b91d18 Fixed issue with ordering breaking if there is no order is set in the URL 2014-11-05 14:06:37 +00:00
tomtom5152
7c87d5781f Merge remote-tracking branch 'origin/master'
Conflicts:
	RIGS/templatetags/filters.py
	db.sqlite3
2014-11-05 13:29:57 +00:00