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

[fix] patch #5831

Browse Source
This commit is contained in:
Rushabh Mehta 2016-07-22 12:19:18 +05:30
parent f276b52af3
commit 04a64a7f48
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/demo/setup_data.py
View File

@ -52,7 +52,7 @@ def complete_setup(domain='Manufacturing'):
"fy_start_date": "2015-01-01", "fy_start_date": "2015-01-01",
"fy_end_date": "2015-12-31", "fy_end_date": "2015-12-31",
"bank_account": "National Bank", "bank_account": "National Bank",
"industry": domain, "domain": domain,
"company_name": data.get(domain).get('company_name'), "company_name": data.get(domain).get('company_name'),
"chart_of_accounts": "Standard", "chart_of_accounts": "Standard",
"company_abbr": ''.join([d[0] for d in data.get(domain).get('company_name').split()]).upper(), "company_abbr": ''.join([d[0] for d in data.get(domain).get('company_name').split()]).upper(),

3
erpnext/patches/v7_0/fix_duplicate_icons.py
View File

@ -2,9 +2,12 @@ import frappe
from frappe.desk.doctype.desktop_icon.desktop_icon import (sync_desktop_icons, from frappe.desk.doctype.desktop_icon.desktop_icon import (sync_desktop_icons,
get_desktop_icons, set_hidden) get_desktop_icons, set_hidden)
from erpnext.patches.v7_0.migrate_schools_to_erpnext import reload_doctypes_for_schools_icons
def execute(): def execute():
'''hide new style icons if old ones are set''' '''hide new style icons if old ones are set'''
reload_doctypes_for_schools_icons()
sync_desktop_icons() sync_desktop_icons()
for user in frappe.get_all('User', filters={'user_type': 'System User'}): for user in frappe.get_all('User', filters={'user_type': 'System User'}):

9
erpnext/patches/v7_0/migrate_schools_to_erpnext.py
View File

@ -3,9 +3,7 @@ import frappe
from erpnext.setup.setup_wizard import domainify from erpnext.setup.setup_wizard import domainify
def execute(): def execute():
for name in ('student', 'student_group', 'course_schedule', 'student_attendance', reload_doctypes_for_schools_icons()
'course', 'program', 'student_applicant', 'examination', 'fees', 'instructor'):
frappe.reload_doc('schools', 'doctype', name)
frappe.reload_doc('website', 'doctype', 'portal_settings') frappe.reload_doc('website', 'doctype', 'portal_settings')
frappe.reload_doc('website', 'doctype', 'portal_menu_item') frappe.reload_doc('website', 'doctype', 'portal_menu_item')
@ -27,3 +25,8 @@ def execute():
else: else:
frappe.get_doc('Portal Settings', 'Portal Settings').sync_menu() frappe.get_doc('Portal Settings', 'Portal Settings').sync_menu()
domainify.setup_sidebar_items(domainify.get_domain('Manufacturing')) 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)