From c614e6d117d862211752d2b1f373b14172153509 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 6 Sep 2021 13:47:56 +0530 Subject: [PATCH] fix: patch failure for vat audit report (#27355) (cherry picked from commit 14b01619dee91ff41381d180bc907ad18744e15a) # Conflicts: # erpnext/patches/v13_0/add_custom_field_for_south_africa.py --- erpnext/patches/v13_0/add_custom_field_for_south_africa.py | 6 ++++++ 1 file changed, 6 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..0a3be89fbfc 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,15 @@ 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('regional', 'report', 'vat_audit_report') + frappe.reload_doc('accounts', 'doctype', 'south_africa_vat_account') +>>>>>>> 14b01619de (fix: patch failure for vat audit report (#27355)) make_custom_fields() add_permissions()