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

fix(picklist): calculate picked qty excluding the delivered qty

Browse Source 
(cherry picked from commit f5b75b27d7)

# Conflicts:
#	erpnext/stock/doctype/pick_list/pick_list.py
This commit is contained in:
Sudharsanan11
2025-12-03 17:48:38 +05:30
committed by Mergify
parent 10f1c9c3ac
commit a5e18d4ef8
1 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
erpnext/stock/doctype/pick_list/pick_list.py
View File

@@ -527,6 +527,47 @@ class PickList(Document):
if serial_no: if serial_no:
picked_items[row.item_code][key]["serial_no"].extend(serial_no) picked_items[row.item_code][key]["serial_no"].extend(serial_no)
<<<<<<< HEAD
=======
def _get_pick_list_items(self, items):
pi = frappe.qb.DocType("Pick List")
pi_item = frappe.qb.DocType("Pick List Item")
query = (
frappe.qb.from_(pi)
.inner_join(pi_item)
.on(pi.name == pi_item.parent)
.select(
pi_item.item_code,
pi_item.warehouse,
pi_item.batch_no,
pi_item.serial_and_batch_bundle,
pi_item.serial_no,
(
Case()
.when(
(pi_item.picked_qty > 0) & (pi_item.docstatus == 1),
pi_item.picked_qty - pi_item.delivered_qty,
)
.else_(pi_item.stock_qty)
).as_("picked_qty"),
)
.where(
(pi_item.item_code.isin([x.item_code for x in items]))
& ((pi_item.picked_qty > 0) | (pi_item.stock_qty > 0))
& (pi.status != "Completed")
& (pi.status != "Cancelled")
& (pi_item.docstatus != 2)
)
)
if self.name:
query = query.where(pi_item.parent != self.name)
query = query.for_update()
return query.run(as_dict=True)
>>>>>>> f5b75b27d7 (fix(picklist): calculate picked qty excluding the delivered qty)
def _get_product_bundles(self) -> dict[str, str]: def _get_product_bundles(self) -> dict[str, str]:
# Dict[so_item_row: item_code] # Dict[so_item_row: item_code]
product_bundles = {} product_bundles = {}