nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 10:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2018-03-23 16:20:27 +05:30
parent 35397a1033 0712013960
commit 061d912749
39 changed files with 1350 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/setup/setup_wizard/operations/install_fixtures.py
View File

@@ -217,6 +217,7 @@ def install(country=None):
{'doctype': "Party Type", "party_type": "Employee"},
{'doctype': "Party Type", "party_type": "Member"},
{'doctype': "Party Type", "party_type": "Shareholder"},
{'doctype': "Party Type", "party_type": "Student"},
{'doctype': "Opportunity Type", "name": "Hub"},
{'doctype': "Opportunity Type", "name": _("Sales")},