From 960443d268ea530004a170f3616c936016ff3d95 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 21:22:21 +0530 Subject: [PATCH] fix: not able to submit subcontracting pr (old flow) (backport #39622) (#39625) fix: not able to submit subcontracting pr (old flow) (#39622) (cherry picked from commit 5cf47ae5f991218ed74efeb2cce7f00a54475e6b) Co-authored-by: rohitwaghchaure --- .../controllers/subcontracting_controller.py | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py index 65d087261f..17a2b07daa 100644 --- a/erpnext/controllers/subcontracting_controller.py +++ b/erpnext/controllers/subcontracting_controller.py @@ -260,18 +260,22 @@ class SubcontractingController(StockController): return frappe.get_all(f"{doctype}", fields=fields, filters=filters) def __get_consumed_items(self, doctype, receipt_items): + fields = [ + "serial_no", + "rm_item_code", + "reference_name", + "batch_no", + "consumed_qty", + "main_item_code", + "parent as voucher_no", + ] + + if self.subcontract_data.receipt_supplied_items_field != "Purchase Receipt Item Supplied": + fields.append("serial_and_batch_bundle") + return frappe.get_all( self.subcontract_data.receipt_supplied_items_field, - fields=[ - "serial_no", - "rm_item_code", - "reference_name", - "serial_and_batch_bundle", - "batch_no", - "consumed_qty", - "main_item_code", - "parent as voucher_no", - ], + fields=fields, filters={"docstatus": 1, "reference_name": ("in", list(receipt_items)), "parenttype": doctype}, )