Merge branch 'master' into training

# Conflicts:
#	RIGS/models.py
This commit is contained in:
2022-01-14 18:03:56 +00:00
9 changed files with 94 additions and 33 deletions

View File

@@ -33,6 +33,7 @@ class AssetSearchForm(forms.Form):
category = forms.ModelMultipleChoiceField(models.AssetCategory.objects.all(), required=False)
status = forms.ModelMultipleChoiceField(models.AssetStatus.objects.all(), required=False)
is_cable = forms.BooleanField(required=False)
date_acquired = forms.DateField(required=False)
class SupplierForm(forms.ModelForm):