nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues 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
parent a5be5c41cc 00d344b934
commit 650501526f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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()