diff --git a/sage_validation/file_validator/forms.py b/sage_validation/file_validator/forms.py index 5a1034ffd46797ba97f7a40c931d7da2693d4d8b..71d908ee494429edfa96a2cb8afe8d4a4f9770d1 100644 --- a/sage_validation/file_validator/forms.py +++ b/sage_validation/file_validator/forms.py @@ -245,10 +245,10 @@ class CSVUploadForm(forms.Form): nominal_account_name = row.get(nominal_account_field) if not cc and not dep and not nominal_account_name: - errors.append( - f"Row {index}: Missing values in '{cc_field}', '{dep_field}', and '{nominal_account_field}'.") continue if not cc or not dep or not nominal_account_name: + errors.append( + f"Row {index}: Missing values in '{cc_field}', '{dep_field}', or '{nominal_account_field}'.") continue cc_type = cost_centre_map.get(cc) diff --git a/test/test_file_validator/test_forms.py b/test/test_file_validator/test_forms.py index 3a779cdac6eb0a0332b0451f61ccaf47fb2f90c7..e1f51defcb65ca7bbd7d1878d01f680a9e88f7f3 100644 --- a/test/test_file_validator/test_forms.py +++ b/test/test_file_validator/test_forms.py @@ -102,14 +102,13 @@ def test_validate_nc_cc_dep_combination_against_meo_sage_account_blank_values( { "NominalAnalysisNominalCostCentre/1": "", "NominalAnalysisNominalDepartment/1": "", - "NominalAnalysisNominalAccountNumber/1": "" }) form = CSVUploadForm(files={"file": modified_file}) assert not form.is_valid() assert ( "Row 1: Missing values in 'NominalAnalysisNominalCostCentre/1', 'NominalAnalysisNominalDepartment/1'," - " and 'NominalAnalysisNominalAccountNumber/1'." + " or 'NominalAnalysisNominalAccountNumber/1'." in str(form.errors["file"][0]) )