nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Pratik Vyas
2015-02-09 18:34:23 +05:30
parent f3a9d788bf e0a8f2d859
commit eac82039e3
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@@ -1 +1 @@
__version__ = '4.21.2' __version__ = '4.21.3'

2
erpnext/hooks.py
View File

@@ -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_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "4.21.2" app_version = "4.21.3"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

2
erpnext/manufacturing/doctype/bom/bom.py
View File

@@ -27,7 +27,7 @@ class BOM(Document):
self.validate_main_item() self.validate_main_item()
from erpnext.utilities.transaction_base import validate_uom_is_integer 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_operations()
self.validate_materials() self.validate_materials()

4
erpnext/utilities/transaction_base.py
View File

@@ -95,7 +95,7 @@ def delete_events(ref_type, ref_name):
class UOMMustBeIntegerError(frappe.ValidationError): pass 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): if isinstance(qty_fields, basestring):
qty_fields = [qty_fields] qty_fields = [qty_fields]
@@ -106,7 +106,7 @@ def validate_uom_is_integer(doc, uom_field, qty_fields):
if not integer_uoms: if not integer_uoms:
return 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: if d.get(uom_field) in integer_uoms:
for f in qty_fields: for f in qty_fields:
if d.get(f): if d.get(f):

2
setup.py
View File

@@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
import os import os
version = "4.21.2" version = "4.21.3"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()

1
test_sites/test_site/site_config.json
View File

@@ -3,5 +3,6 @@
"db_password": "test_frappe", "db_password": "test_frappe",
"admin_password": "admin", "admin_password": "admin",
"host_name": "http://localhost:8888", "host_name": "http://localhost:8888",
"auto_email_id": "admin@example.com",
"mute_emails": 1 "mute_emails": 1
} }