nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-10-14 14:57:28 +05:30
committed by GitHub
parent 9aa9b181e5
commit 7d533b7086
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@@ -812,20 +812,6 @@ def get_returned_qty_map(delivery_note):
dni = DocType("Delivery Note Item") dni = DocType("Delivery Note Item")
returned_qty_map = frappe._dict( returned_qty_map = frappe._dict(
<<<<<<< HEAD
frappe.db.sql(
"""select dn_item.dn_detail, sum(abs(dn_item.qty)) as qty
from `tabDelivery Note Item` dn_item, `tabDelivery Note` dn
where dn.name = dn_item.parent
and dn.docstatus = 1
and dn.is_return = 1
and dn.return_against = %s
and dn_item.qty <= 0
group by dn_item.item_code
""",
delivery_note,
)
=======
( (
frappe.qb.from_(dni) frappe.qb.from_(dni)
.join(dn) .join(dn)
@@ -839,7 +825,6 @@ def get_returned_qty_map(delivery_note):
) )
.groupby(dni.dn_detail) .groupby(dni.dn_detail)
).run() ).run()
>>>>>>> fd9167f2af (fix: add GROUP BY for dn_detail and convert SQL query to QB)
) )
return returned_qty_map return returned_qty_map