Update goods forms to use Fieldset

exporter/goods/forms/common.py

@@ -275,7 +275,7 @@ def clean(self):
         return cleaned_data
 
 
-class ProductDocumentAvailabilityForm(BaseForm):
+class ProductDocumentAvailabilityForm(FieldsetForm):
     class Layout:
         TITLE = "Do you have a document that shows what your product is and what it's designed to do?"
 
@@ -324,7 +324,7 @@ def clean(self):
         return cleaned_data
 
 
-class ProductDocumentSensitivityForm(BaseForm):
+class ProductDocumentSensitivityForm(FieldsetForm):
     class Layout:
         TITLE = "Is the document rated above Official-sensitive?"
 
@@ -354,7 +354,7 @@ def get_layout_fields(self):
         )
 
 
-class ProductDocumentUploadForm(BaseForm):
+class ProductDocumentUploadForm(FieldsetForm):
     class Layout:
         TITLE = "Upload a document that shows what your product is designed to do"
 
@@ -404,7 +404,7 @@ def get_layout_fields(self):
         return layout_fields
 
 
-class ProductOnwardExportedForm(BaseForm):
+class ProductOnwardExportedForm(FieldsetForm):
     class Layout:
         TITLE = "Is the product going to any ultimate end-users?"
 
@@ -431,7 +431,7 @@ def get_layout_fields(self):
         )
 
 
-class ProductOnwardAlteredProcessedForm(BaseForm):
+class ProductOnwardAlteredProcessedForm(FieldsetForm):
     class Layout:
         TITLE = "Will the item be altered or processed before it is exported again?"
 
@@ -482,7 +482,7 @@ def clean(self):
         return cleaned_data
 
 
-class ProductOnwardIncorporatedForm(BaseForm):
+class ProductOnwardIncorporatedForm(FieldsetForm):
     class Layout:
         TITLE = "Will the product be incorporated into another item before it is onward exported?"
 

exporter/goods/forms/firearms.py

@@ -462,7 +462,7 @@ def get_layout_fields(self):
         return ("is_covered_by_section_5",)
 
 
-class FirearmMadeBefore1938Form(BaseForm):
+class FirearmMadeBefore1938Form(FieldsetForm):
     class Layout:
         TITLE = "Was the product made before 1938?"
 
@@ -503,7 +503,7 @@ def get_layout_fields(self):
         return ("year_of_manufacture",)
 
 
-class FirearmIsDeactivatedForm(BaseForm):
+class FirearmIsDeactivatedForm(FieldsetForm):
     class Layout:
         TITLE = "Has the product been deactivated?"
 
@@ -599,7 +599,7 @@ def clean(self):
         return cleaned_data
 
 
-class FirearmSerialIdentificationMarkingsForm(BaseForm):
+class FirearmSerialIdentificationMarkingsForm(FieldsetForm):
     class Layout:
         TITLE = "Will each product have a serial number or other identification marking?"