nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-27 10:38:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Rushabh Mehta
2016-08-10 18:19:14 +05:30
parent c9501eb460 18480bdc23
commit 332729e99e
2 changed files with 2 additions and 2 deletions
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
import frappe
__version__ = '7.0.24'
__version__ = '7.0.25'
def get_default_company(user=None):
'''Get default company for user'''

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

@@ -22,4 +22,4 @@ def execute():
def reload_doctypes_for_schools_icons():
for d in frappe.get_all('DocType', filters={'module': 'Schools'}):
frappe.reload_doc('schools', 'doctype', d.name)
frappe.reload_doc('schools', 'doctype', frappe.scrub(d.name))