nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multi-UOM for sales/purchase return (#13132)

Browse Source 
* Multi-UOM for sales/purchase return

* Update sales_and_purchase_return.py
This commit is contained in:
rohitwaghchaure
2018-03-01 11:31:33 +05:30
committed by Nabin Hait
parent 6578bc11b6
commit 0df95fa781
3 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/utilities/transaction_base.py
View File

@@ -71,6 +71,8 @@ class TransactionBase(StatusUpdater):
validate_uom_is_integer(self, uom_field, qty_fields)
def validate_with_previous_doc(self, ref):
self.exclude_fields = ["conversion_factor", "uom"] if self.get('is_return') else []
for key, val in ref.items():
is_child = val.get("is_child_table")
ref_doc = {}
@@ -101,7 +103,7 @@ class TransactionBase(StatusUpdater):
frappe.throw(_("Invalid reference {0} {1}").format(reference_doctype, reference_name))
for field, condition in fields:
if prevdoc_values[field] is not None:
if prevdoc_values[field] is not None and field not in self.exclude_fields:
self.validate_value(field, condition, prevdoc_values[field], doc)