From aacb0a702e60588cb550c7009c4b1e6f499026a3 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Fri, 6 Feb 2015 16:55:41 +0530 Subject: [PATCH 1/3] Add auto email id in test site_config.json --- test_sites/test_site/site_config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/test_sites/test_site/site_config.json b/test_sites/test_site/site_config.json index 1b388a0856..a94f27cb8f 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 } From c5fb88c1cd189cd8b06a2ce4d30d79a9f68dfa47 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 9 Feb 2015 16:46:46 +0530 Subject: [PATCH 2/3] UOM validation for BOM Items --- erpnext/manufacturing/doctype/bom/bom.py | 2 +- erpnext/utilities/transaction_base.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index 8a19f41f95..b7a89c861d 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -27,7 +27,7 @@ class BOM(Document): 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 4ba162790c..5e24d9b189 100644 --- a/erpnext/utilities/transaction_base.py +++ b/erpnext/utilities/transaction_base.py @@ -95,7 +95,7 @@ def delete_events(ref_type, ref_name): 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 @@ def validate_uom_is_integer(doc, uom_field, qty_fields): 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): From e0a8f2d859b4b7d1e7b12f69b6abbca61811288d Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 9 Feb 2015 19:04:23 +0600 Subject: [PATCH 3/3] bumped to version 4.21.3 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index ebbb35b1c7..34df5a0194 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 40a0a0e584..7e3379cc75 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -4,7 +4,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors" 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/setup.py b/setup.py index 2c17234e53..80e3155ae8 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()