Merge pull request #7764 from rohitwaghchaure/clean_supplied_items
[Fix] Cleanup supplied items if supply raw material is set as No
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 706a8e5..4f53d0d 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.2.19'
+__version__ = '7.2.21'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/schools/doctype/assessment/assessment.py b/erpnext/schools/doctype/assessment/assessment.py
index 003b427..5088336 100644
--- a/erpnext/schools/doctype/assessment/assessment.py
+++ b/erpnext/schools/doctype/assessment/assessment.py
@@ -34,7 +34,7 @@
validate_overlap_for(self, "Assessment", "student_group")
validate_overlap_for(self, "Assessment", "room")
- validate_overlap_for(self, "Assessment", "supervisor", self.instructor)
+ validate_overlap_for(self, "Assessment", "supervisor", self.supervisor)
def get_assessment_list(doctype, txt, filters, limit_start, limit_page_length=20):
diff --git a/erpnext/utilities/__init__.py b/erpnext/utilities/__init__.py
index bba21e6..b94061c 100644
--- a/erpnext/utilities/__init__.py
+++ b/erpnext/utilities/__init__.py
@@ -1,6 +1,7 @@
## temp utility
import frappe
+from erpnext.utilities.activation import get_level
def update_doctypes():
for d in frappe.db.sql("""select df.parent, df.fieldname
@@ -29,5 +30,6 @@
return {
'company': company,
- 'domain': domain
+ 'domain': domain,
+ 'activation': get_level()
}
diff --git a/erpnext/utilities/activation.py b/erpnext/utilities/activation.py
new file mode 100644
index 0000000..563f71e
--- /dev/null
+++ b/erpnext/utilities/activation.py
@@ -0,0 +1,36 @@
+import frappe
+
+def get_level():
+ activation_level = 0
+ if frappe.db.get_single_value('System Settings', 'setup_complete'):
+ activation_level = 1
+
+ if frappe.db.count('Item') > 5:
+ activation_level += 1
+
+ if frappe.db.count('Customer') > 5:
+ activation_level += 1
+
+ if frappe.db.count('Sales Order') > 2:
+ activation_level += 1
+
+ if frappe.db.count('Purchase Order') > 2:
+ activation_level += 1
+
+ if frappe.db.count('Employee') > 3:
+ activation_level += 1
+
+ if frappe.db.count('Payment Entry') > 2:
+ activation_level += 1
+
+ if frappe.db.count('Communication', dict(communication_medium='Email')) > 10:
+ activation_level += 1
+
+ if frappe.db.count('User') > 5:
+ activation_level += 1
+
+ # recent login
+ if frappe.db.sql('select name from tabUser where last_login > date_sub(now(), interval 2 day) limit 1'):
+ activation_level += 1
+
+ return activation_level
\ No newline at end of file