Merge branch 'master' into subhire

# Conflicts:
#	Pipfile
#	Pipfile.lock
#	package-lock.json
This commit is contained in:
2022-11-21 11:39:25 +00:00
31 changed files with 4137 additions and 3658 deletions

View File

@@ -233,7 +233,7 @@ class EventChecklistForm(forms.ModelForm):
for key in vehicles:
pk = int(key.split('_')[1])
driver_key = 'driver_' + str(pk)
if(self.data[driver_key] == ''):
if (self.data[driver_key] == ''):
raise forms.ValidationError('Add a driver to vehicle ' + str(pk), code='vehicle_mismatch')
else:
try: