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

chore: resolve conflicts

Browse Source
This commit is contained in:
Diptanil Saha
2026-06-19 15:09:54 +05:30
committed by GitHub
parent a1570bd80d
commit 62ff4d4334
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py
View File

@@ -74,13 +74,9 @@ def validate_company(company):
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def import_coa(file_name, company): def import_coa(file_name, company):
=======
def import_coa(file_name: str, company: str):
frappe.only_for("Accounts Manager") frappe.only_for("Accounts Manager")
>>>>>>> 8c1a1aafe6 (fix(coa_importer): allow importing COA through `import_coa` only for `Accounts Manager` (#56132))
# delete existing data for accounts # delete existing data for accounts
frappe.has_permission("Company", "write", company, throw=True) frappe.has_permission("Company", "write", company, throw=True)
unset_existing_data(company) unset_existing_data(company)