fix: south africa vat patch failure (#27323 )

reload doc is necessary on new doctypes (cherry picked from commit d1fe060e4a) # Conflicts: # erpnext/patches/v13_0/add_custom_field_for_south_africa.py
2025-02-28 00:12:39 +00:00
1 changed files with 5 additions and 0 deletions
--- a/erpnext/patches/v13_0/add_custom_field_for_south_africa.py
+++ b/erpnext/patches/v13_0/add_custom_field_for_south_africa.py
@@ -11,9 +11,14 @@ def execute():
 	if not company:
 		return

+<<<<<<< HEAD
 	frappe.reload_doc("regional", "doctype", "south_africa_vat_settings")
 	frappe.reload_doc("regional", "report", "vat_audit_report")
 	frappe.reload_doc("accounts", "doctype", "south_africa_vat_account")
+=======
+	frappe.reload_doc('regional', 'doctype', 'south_africa_vat_settings')
+	frappe.reload_doc('accounts', 'doctype', 'south_africa_vat_account')
+>>>>>>> d1fe060e4a (fix: south africa vat patch failure (#27323))

 	make_custom_fields()
 	add_permissions()