From 778465b67b76c3dccfb486915877bf8a308597e8 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 3 Sep 2021 12:02:32 +0530 Subject: [PATCH] fix: south africa vat patch failure (#27323) reload doc is necessary on new doctypes (cherry picked from commit d1fe060e4afb96324492beca77c69698cb32a085) # Conflicts: # erpnext/patches/v13_0/add_custom_field_for_south_africa.py --- erpnext/patches/v13_0/add_custom_field_for_south_africa.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/patches/v13_0/add_custom_field_for_south_africa.py b/erpnext/patches/v13_0/add_custom_field_for_south_africa.py index 353376b6038..c49a7b57e6a 100644 --- 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()