commit 612b31b62660d7db57f02a63d8325500bed2c9f9
author Rushabh Mehta <rmehta@gmail.com> Fri May 19 18:33:55 2017 +0530
committer Rushabh Mehta <rmehta@gmail.com> Fri May 19 18:33:55 2017 +0530
tree 32e1759c1cda4c134027624f34e3d067f4355430
parent 03fb6ff0039dc925c37c0b8c738573c263d7678d
parent d144a4c621305e29ae7006cb9690208ab374297d

Merge branch 'master' into develop

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 97a2c73..3595237 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.0.31'
+__version__ = '8.0.32'
 
 
 def get_default_company(user=None):

erpnext/utilities/activation.py

diff --git a/erpnext/utilities/activation.py b/erpnext/utilities/activation.py
index 0b73d3e..1ae92c1 100644
--- a/erpnext/utilities/activation.py
+++ b/erpnext/utilities/activation.py
@@ -37,9 +37,6 @@
 	if frappe.db.count('Student') > 5:
 		activation_level += 1
 
-	if frappe.db.count('Student Batch Name') > 5:
-		activation_level += 1
-
 	if frappe.db.count('Instructor') > 5:
 		activation_level += 1