Merge branch 'develop' into github-issue-33344
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 9fcb769..15c270e 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -131,7 +131,7 @@
)
elif ref.serial_no:
- if not d.serial_no:
+ if d.qty and not d.serial_no:
frappe.throw(_("Row # {0}: Serial No is mandatory").format(d.idx))
else:
serial_nos = get_serial_nos(d.serial_no)
@@ -400,6 +400,16 @@
if serial_nos:
target_doc.serial_no = "\n".join(serial_nos)
+ if source_doc.get("rejected_serial_no"):
+ returned_serial_nos = get_returned_serial_nos(
+ source_doc, source_parent, serial_no_field="rejected_serial_no"
+ )
+ rejected_serial_nos = list(
+ set(get_serial_nos(source_doc.rejected_serial_no)) - set(returned_serial_nos)
+ )
+ if rejected_serial_nos:
+ target_doc.rejected_serial_no = "\n".join(rejected_serial_nos)
+
if doctype in ["Purchase Receipt", "Subcontracting Receipt"]:
returned_qty_map = get_returned_qty_map_for_row(
source_parent.name, source_parent.supplier, source_doc.name, doctype
@@ -610,7 +620,7 @@
return filters
-def get_returned_serial_nos(child_doc, parent_doc):
+def get_returned_serial_nos(child_doc, parent_doc, serial_no_field="serial_no"):
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
return_ref_field = frappe.scrub(child_doc.doctype)
@@ -619,7 +629,7 @@
serial_nos = []
- fields = ["`{0}`.`serial_no`".format("tab" + child_doc.doctype)]
+ fields = [f"`{'tab' + child_doc.doctype}`.`{serial_no_field}`"]
filters = [
[parent_doc.doctype, "return_against", "=", parent_doc.name],
@@ -629,6 +639,6 @@
]
for row in frappe.get_all(parent_doc.doctype, fields=fields, filters=filters):
- serial_nos.extend(get_serial_nos(row.serial_no))
+ serial_nos.extend(get_serial_nos(row.get(serial_no_field)))
return serial_nos