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

Merge pull request #12705 from achillesrasquinha/12704

Browse Source 
Fix for python 3 compatibility
This commit is contained in:
tundebabzy
2018-01-30 09:26:51 +01:00
committed by GitHub
parent 4e195d97c7 2862e25f3e
commit df50a6f828
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/utils.py
View File

@@ -128,7 +128,7 @@ def insert_record(records):
doc.update(r) doc.update(r)
try: try:
doc.insert(ignore_permissions=True) doc.insert(ignore_permissions=True)
except frappe.DuplicateEntryError, e: except frappe.DuplicateEntryError as e:
# pass DuplicateEntryError and continue # pass DuplicateEntryError and continue
if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name: if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name:
# make sure DuplicateEntryError is for the exact same doc and not a related doc # make sure DuplicateEntryError is for the exact same doc and not a related doc