mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-22 19:55:29 +00:00
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com> fix: consider returned qty in subcontracting report (#53616)
This commit is contained in:
@@ -41,6 +41,7 @@ def get_columns(filters):
|
||||
"fieldname": "transferred_qty",
|
||||
"width": 200,
|
||||
},
|
||||
{"label": _("Returned Quantity"), "fieldtype": "Float", "fieldname": "returned_qty", "width": 150},
|
||||
{"label": _("Pending Quantity"), "fieldtype": "Float", "fieldname": "p_qty", "width": 150},
|
||||
]
|
||||
|
||||
@@ -50,7 +51,7 @@ def get_data(filters):
|
||||
|
||||
data = []
|
||||
for row in order_rm_item_details:
|
||||
transferred_qty = row.get("transferred_qty") or 0
|
||||
transferred_qty = (row.get("transferred_qty") or 0) - (row.get("returned_qty") or 0)
|
||||
if transferred_qty < row.get("reqd_qty", 0):
|
||||
pending_qty = frappe.utils.flt(row.get("reqd_qty", 0) - transferred_qty)
|
||||
row.p_qty = pending_qty if pending_qty > 0 else 0
|
||||
@@ -86,6 +87,7 @@ def get_order_items_to_supply(filters):
|
||||
f"`tab{supplied_items_table}`.rm_item_code as rm_item_code",
|
||||
f"`tab{supplied_items_table}`.required_qty as reqd_qty",
|
||||
f"`tab{supplied_items_table}`.supplied_qty as transferred_qty",
|
||||
f"`tab{supplied_items_table}`.returned_qty as returned_qty",
|
||||
],
|
||||
filters=record_filters,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user