schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflict while merging v4 into v5

Browse Source
This commit is contained in:
Nabin Hait
2015-02-10 16:37:18 +05:30
parent 2813f38c5a eac82039e3
commit 15cd12214e
55 changed files with 7612 additions and 3974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/utilities/transaction_base.py
View File

@@ -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):