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 2017-04-21 11:49:09 +05:30
commit e713a7d840
2 changed files with 3 additions and 1 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__ = '8.0.14' __version__ = '8.0.15'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/setup/setup_wizard/setup_wizard.py
View File

@ -571,6 +571,7 @@ def create_program(args):
for i in xrange(1,6): for i in xrange(1,6):
if args.get("program_" + str(i)): if args.get("program_" + str(i)):
program = frappe.new_doc("Program") program = frappe.new_doc("Program")
program.program_code = args.get("program_" + str(i))
program.program_name = args.get("program_" + str(i)) program.program_name = args.get("program_" + str(i))
try: try:
program.save() program.save()
@ -581,6 +582,7 @@ def create_course(args):
for i in xrange(1,6): for i in xrange(1,6):
if args.get("course_" + str(i)): if args.get("course_" + str(i)):
course = frappe.new_doc("Course") course = frappe.new_doc("Course")
course.course_code = args.get("course_" + str(i))
course.course_name = args.get("course_" + str(i)) course.course_name = args.get("course_" + str(i))
try: try:
course.save() course.save()