Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[merge] fixed conflict

Browse Source
This commit is contained in:
Nabin Hait 2013-07-07 11:38:10 +05:30
commit 650501526f
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
patches/july_2013/__init__.py Normal file
View File

3
patches/july_2013/restore_tree_roots.py Normal file
View File

@ -0,0 +1,3 @@
def execute():
from startup.install import import_defaults
import_defaults()

8
startup/install.py
View File

@ -135,7 +135,7 @@ def import_defaults():
# supplier type
{'doctype': 'Supplier Type', 'name': 'Default Supplier Type', 'supplier_type': 'Default Supplier Type'},
# warehouse type
{'doctype': 'Warehouse Type', 'name': 'Default Warehouse Type', 'warehouse_type': 'Default Warehouse Type'},
{'doctype': 'Warehouse Type', 'name': 'Fixed Asset', 'warehouse_type': 'Fixed Asset'},
@ -170,6 +170,6 @@ def import_defaults():
]
for r in records:
bean = webnotes.bean(r)
bean.insert()
if not webnotes.conn.exists(r['doctype'], r['name']):
bean = webnotes.bean(r)
bean.insert()