nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 23:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-01-06 21:02:44 +05:30
committed by GitHub
parent f4cda10ca8
commit ef710de9f5
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -831,18 +831,8 @@ def get_requested_item_qty(sales_order):
for d in frappe.db.get_all( for d in frappe.db.get_all(
"Material Request Item", "Material Request Item",
filters={"docstatus": 1, "sales_order": sales_order}, filters={"docstatus": 1, "sales_order": sales_order},
<<<<<<< HEAD fields=["sales_order_item", "packed_item", "sum(qty) as qty", "sum(received_qty) as received_qty"],
fields=["sales_order_item", "sum(qty) as qty", "sum(received_qty) as received_qty"],
group_by="sales_order_item",
=======
fields=[
"sales_order_item",
"packed_item",
{"SUM": "qty", "as": "qty"},
{"SUM": "received_qty", "as": "received_qty"},
],
group_by="sales_order_item, packed_item", group_by="sales_order_item, packed_item",
>>>>>>> 6ade609dd6 (fix(material-request): get remaining qty on partial transaction with product bundle)
): ):
result[d.sales_order_item or d.packed_item] = frappe._dict( result[d.sales_order_item or d.packed_item] = frappe._dict(
{"qty": d.qty, "received_qty": d.received_qty} {"qty": d.qty, "received_qty": d.received_qty}