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

fix: merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2021-05-11 11:15:09 +05:30
parent ec2ba6bc1f d2520680bc
commit e38192cb6d
167 changed files with 3106 additions and 1667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/setup/setup_wizard/operations/install_fixtures.py
View File

@@ -428,7 +428,6 @@ def install_post_company_fixtures(args=None):
frappe.local.flags.ignore_update_nsm = True
make_records(records[1:])
frappe.local.flags.ignore_update_nsm = False
rebuild_tree("Department", "parent_department")