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

feat: expiry date column in Available Batch Report (backport #42628) (#42641)

Browse Source 
* feat: expiry date column in Available Batch Report (#42628)

(cherry picked from commit faff84c6e5)

# Conflicts:
#	erpnext/stock/report/available_batch_report/available_batch_report.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2024-08-06 15:24:37 +05:30
committed by GitHub
parent bc50512c97
commit 83928bbf78
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/stock/report/available_batch_report/available_batch_report.py
View File

@@ -54,6 +54,12 @@ def get_columns(filters):
"width": 150, "width": 150,
"options": "Batch", "options": "Batch",
}, },
{
"label": _("Expiry Date"),
"fieldname": "expiry_date",
"fieldtype": "Date",
"width": 120,
},
{"label": _("Balance Qty"), "fieldname": "balance_qty", "fieldtype": "Float", "width": 150}, {"label": _("Balance Qty"), "fieldname": "balance_qty", "fieldtype": "Float", "width": 150},
] ]
) )
@@ -96,6 +102,7 @@ def get_batchwise_data_from_stock_ledger(filters):
table.item_code, table.item_code,
table.batch_no, table.batch_no,
table.warehouse, table.warehouse,
batch.expiry_date,
Sum(table.actual_qty).as_("balance_qty"), Sum(table.actual_qty).as_("balance_qty"),
) )
.where(table.is_cancelled == 0) .where(table.is_cancelled == 0)
@@ -118,11 +125,15 @@ def get_query_based_on_filters(query, batch, table, filters):
if filters.batch_no: if filters.batch_no:
query = query.where(batch.name == filters.batch_no) query = query.where(batch.name == filters.batch_no)
if filters.to_date == today():
if not filters.include_expired_batches: if not filters.include_expired_batches:
query = query.where((batch.expiry_date >= today()) | (batch.expiry_date.isnull())) query = query.where((batch.expiry_date >= today()) | (batch.expiry_date.isnull()))
if filters.to_date == today():
query = query.where(batch.batch_qty > 0) query = query.where(batch.batch_qty > 0)
else:
query = query.where(table.posting_date <= filters.to_date)
if filters.warehouse: if filters.warehouse:
lft, rgt = frappe.db.get_value("Warehouse", filters.warehouse, ["lft", "rgt"]) lft, rgt = frappe.db.get_value("Warehouse", filters.warehouse, ["lft", "rgt"])
warehouses = frappe.get_all( warehouses = frappe.get_all(