nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 21:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: south africa vat patch failure (#27323)

Browse Source 
reload doc is necessary on new doctypes

(cherry picked from commit d1fe060e4a)

# Conflicts:
#	erpnext/patches/v13_0/add_custom_field_for_south_africa.py
This commit is contained in:
Ankush Menat
2021-09-03 12:02:32 +05:30
committed by Mergify
parent f5160dc83d
commit 778465b67b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/patches/v13_0/add_custom_field_for_south_africa.py
View File

@@ -11,9 +11,14 @@ def execute():
if not company: if not company:
return return
<<<<<<< HEAD
frappe.reload_doc("regional", "doctype", "south_africa_vat_settings") frappe.reload_doc("regional", "doctype", "south_africa_vat_settings")
frappe.reload_doc("regional", "report", "vat_audit_report") frappe.reload_doc("regional", "report", "vat_audit_report")
frappe.reload_doc("accounts", "doctype", "south_africa_vat_account") 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() make_custom_fields()
add_permissions() add_permissions()