Skip to content

Commit 960443d

Browse files
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 5cf47ae) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
1 parent f71af20 commit 960443d

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

erpnext/controllers/subcontracting_controller.py

+14-10
Original file line numberDiff line numberDiff line change
@@ -260,18 +260,22 @@ def __get_received_items(self, doctype):
260260
return frappe.get_all(f"{doctype}", fields=fields, filters=filters)
261261

262262
def __get_consumed_items(self, doctype, receipt_items):
263+
fields = [
264+
"serial_no",
265+
"rm_item_code",
266+
"reference_name",
267+
"batch_no",
268+
"consumed_qty",
269+
"main_item_code",
270+
"parent as voucher_no",
271+
]
272+
273+
if self.subcontract_data.receipt_supplied_items_field != "Purchase Receipt Item Supplied":
274+
fields.append("serial_and_batch_bundle")
275+
263276
return frappe.get_all(
264277
self.subcontract_data.receipt_supplied_items_field,
265-
fields=[
266-
"serial_no",
267-
"rm_item_code",
268-
"reference_name",
269-
"serial_and_batch_bundle",
270-
"batch_no",
271-
"consumed_qty",
272-
"main_item_code",
273-
"parent as voucher_no",
274-
],
278+
fields=fields,
275279
filters={"docstatus": 1, "reference_name": ("in", list(receipt_items)), "parenttype": doctype},
276280
)
277281

0 commit comments

Comments
 (0)