Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
nabinhait committed Apr 21, 2017
2 parents 5650bf9 + 557847a commit e713a7d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion erpnext/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe

__version__ = '8.0.14'
__version__ = '8.0.15'

def get_default_company(user=None):
'''Get default company for user'''
Expand Down
2 changes: 2 additions & 0 deletions erpnext/setup/setup_wizard/setup_wizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,7 @@ def create_program(args):
for i in xrange(1,6):
if args.get("program_" + str(i)):
program = frappe.new_doc("Program")
program.program_code = args.get("program_" + str(i))
program.program_name = args.get("program_" + str(i))
try:
program.save()
Expand All @@ -581,6 +582,7 @@ def create_course(args):
for i in xrange(1,6):
if args.get("course_" + str(i)):
course = frappe.new_doc("Course")
course.course_code = args.get("course_" + str(i))
course.course_name = args.get("course_" + str(i))
try:
course.save()
Expand Down

0 comments on commit e713a7d

Please sign in to comment.