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

fix: patch failure for vat audit report (#27355)

Browse Source 
(cherry picked from commit 14b01619de)

# Conflicts:
#	erpnext/patches/v13_0/add_custom_field_for_south_africa.py
This commit is contained in:
Ankush Menat
2021-09-06 13:47:56 +05:30
committed by Mergify
parent f5160dc83d
commit c614e6d117
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()