Merge branch 'vagrant' into hotfixes

This commit is contained in:
Tom Price
2015-07-23 21:08:44 +01:00
25 changed files with 827 additions and 159 deletions

View File

@@ -47,6 +47,7 @@ class EventCreate(generic.CreateView):
def get_context_data(self, **kwargs):
context = super(EventCreate, self).get_context_data(**kwargs)
context['edit'] = True
context['currentVAT'] = models.VatRate.objects.current_rate()
form = context['form']
if re.search('"-\d+"', form['items_json'].value()):