mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-03 12:19:12 +00:00
fix(material-request): get remaining qty on partial transaction with product bundle
This commit is contained in:
@@ -995,12 +995,15 @@ def get_requested_item_qty(sales_order):
|
|||||||
filters={"docstatus": 1, "sales_order": sales_order},
|
filters={"docstatus": 1, "sales_order": sales_order},
|
||||||
fields=[
|
fields=[
|
||||||
"sales_order_item",
|
"sales_order_item",
|
||||||
|
"packed_item",
|
||||||
{"SUM": "qty", "as": "qty"},
|
{"SUM": "qty", "as": "qty"},
|
||||||
{"SUM": "received_qty", "as": "received_qty"},
|
{"SUM": "received_qty", "as": "received_qty"},
|
||||||
],
|
],
|
||||||
group_by="sales_order_item",
|
group_by="sales_order_item, packed_item",
|
||||||
):
|
):
|
||||||
result[d.sales_order_item] = frappe._dict({"qty": d.qty, "received_qty": d.received_qty})
|
result[d.sales_order_item or d.packed_item] = frappe._dict(
|
||||||
|
{"qty": d.qty, "received_qty": d.received_qty}
|
||||||
|
)
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
@@ -1058,7 +1061,8 @@ def make_material_request(source_name, target_doc=None):
|
|||||||
"Sales Order": {"doctype": "Material Request", "validation": {"docstatus": ["=", 1]}},
|
"Sales Order": {"doctype": "Material Request", "validation": {"docstatus": ["=", 1]}},
|
||||||
"Packed Item": {
|
"Packed Item": {
|
||||||
"doctype": "Material Request Item",
|
"doctype": "Material Request Item",
|
||||||
"field_map": {"parent": "sales_order", "uom": "stock_uom"},
|
"field_map": {"parent": "sales_order", "uom": "stock_uom", "name": "packed_item"},
|
||||||
|
"condition": lambda item: get_remaining_qty(item) > 0,
|
||||||
"postprocess": update_item,
|
"postprocess": update_item,
|
||||||
},
|
},
|
||||||
"Sales Order Item": {
|
"Sales Order Item": {
|
||||||
|
|||||||
@@ -56,6 +56,7 @@
|
|||||||
"lead_time_date",
|
"lead_time_date",
|
||||||
"sales_order",
|
"sales_order",
|
||||||
"sales_order_item",
|
"sales_order_item",
|
||||||
|
"packed_item",
|
||||||
"col_break4",
|
"col_break4",
|
||||||
"production_plan",
|
"production_plan",
|
||||||
"material_request_plan_item",
|
"material_request_plan_item",
|
||||||
@@ -528,6 +529,16 @@
|
|||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"non_negative": 1,
|
"non_negative": 1,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "packed_item",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"hidden": 1,
|
||||||
|
"label": "Packed Item",
|
||||||
|
"no_copy": 1,
|
||||||
|
"print_hide": 1,
|
||||||
|
"read_only": 1,
|
||||||
|
"search_index": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ class MaterialRequestItem(Document):
|
|||||||
material_request_plan_item: DF.Data | None
|
material_request_plan_item: DF.Data | None
|
||||||
min_order_qty: DF.Float
|
min_order_qty: DF.Float
|
||||||
ordered_qty: DF.Float
|
ordered_qty: DF.Float
|
||||||
|
packed_item: DF.Data | None
|
||||||
page_break: DF.Check
|
page_break: DF.Check
|
||||||
parent: DF.Data
|
parent: DF.Data
|
||||||
parentfield: DF.Data
|
parentfield: DF.Data
|
||||||
|
|||||||
Reference in New Issue
Block a user