[fix] patch #5831
diff --git a/erpnext/demo/setup_data.py b/erpnext/demo/setup_data.py
index 5aac9e0..918fd54 100644
--- a/erpnext/demo/setup_data.py
+++ b/erpnext/demo/setup_data.py
@@ -52,7 +52,7 @@
"fy_start_date": "2015-01-01",
"fy_end_date": "2015-12-31",
"bank_account": "National Bank",
- "industry": domain,
+ "domain": domain,
"company_name": data.get(domain).get('company_name'),
"chart_of_accounts": "Standard",
"company_abbr": ''.join([d[0] for d in data.get(domain).get('company_name').split()]).upper(),
@@ -162,7 +162,7 @@
w = frappe.new_doc('Warehouse')
w.warehouse_name = 'Supplier'
w.insert()
-
+
def setup_asset():
assets = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'asset.json')).read())
for d in assets:
@@ -307,7 +307,7 @@
})
ss.insert()
-
+
def setup_salary_structure_for_timesheet():
for e in frappe.get_all('Salary Structure', fields=['name'], filters={'is_active': 'Yes'}, limit=2):
ss_doc = frappe.get_doc("Salary Structure", e.name)
@@ -332,7 +332,7 @@
{'name': _('Medical'), "account": "Utility Expenses - WPL"},
{'name': _('Others'), "account": "Miscellaneous Expenses - WPL"},
{'name': _('Travel'), "account": "Travel Expenses - WPL"}]
-
+
for expense_type in expense_types:
doc = frappe.get_doc("Expense Claim Type", expense_type["name"])
doc.append("accounts", {
@@ -340,10 +340,10 @@
"default_account" : expense_type["account"]
})
doc.save(ignore_permissions=True)
-
+
def setup_budget():
fiscal_years = frappe.get_all("Fiscal Year", order_by="year_start_date")[-2:]
-
+
for fy in fiscal_years:
budget = frappe.new_doc("Budget")
budget.cost_center = get_random("Cost Center")
@@ -353,14 +353,14 @@
add_random_children(budget, "accounts", rows=random.randint(10, expense_ledger_count), randomize = { "account": ("Account", {"is_group": "0", "root_type": "Expense"})
}, unique="account")
-
+
for d in budget.accounts:
d.budget_amount = random.randint(5, 100) * 10000
-
+
budget.save()
budget.submit()
-
-
+
+
def setup_user_roles():
if not frappe.db.get_global('demo_hr_user'):
user = frappe.get_doc('User', 'CharmaineGaudreau@example.com')
@@ -396,7 +396,7 @@
user = frappe.get_doc('User', 'LeonAbdulov@example.com')
user.add_roles('Accounts User', 'Accounts Manager', 'Sales User', 'Purchase User')
frappe.db.set_global('demo_accounts_user', user.name)
-
+
if not frappe.db.get_global('demo_projects_user'):
user = frappe.get_doc('User', 'panca@example.com')
user.add_roles('HR User', 'Projects User')
diff --git a/erpnext/patches/v7_0/fix_duplicate_icons.py b/erpnext/patches/v7_0/fix_duplicate_icons.py
index ee4c3e2..3e762f7 100644
--- a/erpnext/patches/v7_0/fix_duplicate_icons.py
+++ b/erpnext/patches/v7_0/fix_duplicate_icons.py
@@ -2,9 +2,12 @@
from frappe.desk.doctype.desktop_icon.desktop_icon import (sync_desktop_icons,
get_desktop_icons, set_hidden)
+from erpnext.patches.v7_0.migrate_schools_to_erpnext import reload_doctypes_for_schools_icons
def execute():
'''hide new style icons if old ones are set'''
+ reload_doctypes_for_schools_icons()
+
sync_desktop_icons()
for user in frappe.get_all('User', filters={'user_type': 'System User'}):
diff --git a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
index d792d00..55f68d2 100644
--- a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
+++ b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
@@ -3,9 +3,7 @@
from erpnext.setup.setup_wizard import domainify
def execute():
- for name in ('student', 'student_group', 'course_schedule', 'student_attendance',
- 'course', 'program', 'student_applicant', 'examination', 'fees', 'instructor'):
- frappe.reload_doc('schools', 'doctype', name)
+ reload_doctypes_for_schools_icons()
frappe.reload_doc('website', 'doctype', 'portal_settings')
frappe.reload_doc('website', 'doctype', 'portal_menu_item')
@@ -27,3 +25,8 @@
else:
frappe.get_doc('Portal Settings', 'Portal Settings').sync_menu()
domainify.setup_sidebar_items(domainify.get_domain('Manufacturing'))
+
+def reload_doctypes_for_schools_icons():
+ for name in ('student', 'student_group', 'course_schedule', 'student_attendance',
+ 'course', 'program', 'student_applicant', 'examination', 'fees', 'instructor'):
+ frappe.reload_doc('schools', 'doctype', name)