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

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait 2016-08-09 15:30:32 +05:30
commit 722b22a834
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.0.22' __version__ = '7.0.23'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

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

@ -27,6 +27,6 @@ def execute():
domainify.setup_sidebar_items(domainify.get_domain('Manufacturing')) domainify.setup_sidebar_items(domainify.get_domain('Manufacturing'))
def reload_doctypes_for_schools_icons(): def reload_doctypes_for_schools_icons():
for name in ('student', 'student_group', 'course_schedule', 'student_attendance', for name in ('student', 'student_group', 'course_schedule', 'student_attendance', 'room', 'program_enrollment',
'course', 'program', 'student_applicant', 'examination', 'fees', 'instructor', 'announcement'): 'course', 'program', 'student_applicant', 'examination', 'fees', 'instructor', 'announcement'):
frappe.reload_doc('schools', 'doctype', name) frappe.reload_doc('schools', 'doctype', name)