Merge branch 'develop' into alternative-items-quotation

2026-09-20 03:47:11 +00:00 · 2023-02-15 13:05:33 +05:30
parent bd7e6e264e d3ff289779
commit 22010b745c
57 changed files with 1118 additions and 472 deletions
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -252,6 +252,7 @@ def get_already_returned_items(doc):
 			child.parent = par.name and par.docstatus = 1
 			and par.is_return = 1 and par.return_against = %s
 		group by item_code
+		for update
 	""".format(
 			column, doc.doctype, doc.doctype
 		),