Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index ebbb35b..34df5a0 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1 +1 @@
-__version__ = '4.21.2'
+__version__ = '4.21.3'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 40a0a0e..7e3379c 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -4,7 +4,7 @@
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "4.21.2"
+app_version = "4.21.3"
error_report_email = "support@erpnext.com"
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 8a19f41..b7a89c8 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -27,7 +27,7 @@
self.validate_main_item()
from erpnext.utilities.transaction_base import validate_uom_is_integer
- validate_uom_is_integer(self, "stock_uom", "qty")
+ validate_uom_is_integer(self, "stock_uom", "qty", "BOM Item")
self.validate_operations()
self.validate_materials()
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 4ba1627..5e24d9b 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -95,7 +95,7 @@
class UOMMustBeIntegerError(frappe.ValidationError): pass
-def validate_uom_is_integer(doc, uom_field, qty_fields):
+def validate_uom_is_integer(doc, uom_field, qty_fields, child_dt=None):
if isinstance(qty_fields, basestring):
qty_fields = [qty_fields]
@@ -106,7 +106,7 @@
if not integer_uoms:
return
- for d in doc.get_all_children():
+ for d in doc.get_all_children(parenttype=child_dt):
if d.get(uom_field) in integer_uoms:
for f in qty_fields:
if d.get(f):
diff --git a/setup.py b/setup.py
index 2c17234..80e3155 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
-version = "4.21.2"
+version = "4.21.3"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()
diff --git a/test_sites/test_site/site_config.json b/test_sites/test_site/site_config.json
index 1b388a0..a94f27c 100644
--- a/test_sites/test_site/site_config.json
+++ b/test_sites/test_site/site_config.json
@@ -3,5 +3,6 @@
"db_password": "test_frappe",
"admin_password": "admin",
"host_name": "http://localhost:8888",
+ "auto_email_id": "admin@example.com",
"mute_emails": 1
}