mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-31 18:59:08 +00:00
[merge] fixed conflict
This commit is contained in:
0
patches/july_2013/__init__.py
Normal file
0
patches/july_2013/__init__.py
Normal file
3
patches/july_2013/restore_tree_roots.py
Normal file
3
patches/july_2013/restore_tree_roots.py
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
def execute():
|
||||||
|
from startup.install import import_defaults
|
||||||
|
import_defaults()
|
||||||
@@ -170,6 +170,6 @@ def import_defaults():
|
|||||||
]
|
]
|
||||||
|
|
||||||
for r in records:
|
for r in records:
|
||||||
bean = webnotes.bean(r)
|
if not webnotes.conn.exists(r['doctype'], r['name']):
|
||||||
bean.insert()
|
bean = webnotes.bean(r)
|
||||||
|
bean.insert()
|
||||||
Reference in New Issue
Block a user