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

Merge branch 'develop' into remove-nonprofit

Browse Source
This commit is contained in:
Rucha Mahabal
2022-02-24 17:03:52 +05:30
committed by GitHub
parent 358734dcea 4d8d4acec4
commit d647de3782
95 changed files with 2437 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/utils.py
View File

@@ -155,7 +155,7 @@ def insert_record(records):
doc = frappe.new_doc(r.get("doctype"))
doc.update(r)
try:
doc.insert(ignore_permissions=True)
doc.insert(ignore_permissions=True, ignore_if_duplicate=True)
except frappe.DuplicateEntryError as e:
# pass DuplicateEntryError and continue
if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name: