mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-25 07:54:46 +00:00
fix(stock): apply posting datetime filters while fetching available batches (#54976)
This commit is contained in:
committed by
GitHub
parent
7d1a86f4e5
commit
2ad9231fb2
@@ -17,6 +17,7 @@ from pypika import Order
|
|||||||
import erpnext
|
import erpnext
|
||||||
from erpnext.accounts.utils import build_qb_match_conditions
|
from erpnext.accounts.utils import build_qb_match_conditions
|
||||||
from erpnext.stock.get_item_details import ItemDetailsCtx, _get_item_tax_template
|
from erpnext.stock.get_item_details import ItemDetailsCtx, _get_item_tax_template
|
||||||
|
from erpnext.stock.utils import get_combine_datetime
|
||||||
|
|
||||||
|
|
||||||
# searches for active employees
|
# searches for active employees
|
||||||
@@ -498,6 +499,13 @@ def get_batches_from_stock_ledger_entries(searchfields, txt, filters, start=0, p
|
|||||||
.limit(page_len)
|
.limit(page_len)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if not filters.get("is_inward"):
|
||||||
|
if filters.get("posting_date") and filters.get("posting_time"):
|
||||||
|
query = query.where(
|
||||||
|
stock_ledger_entry.posting_datetime
|
||||||
|
<= get_combine_datetime(filters.posting_date, filters.posting_time)
|
||||||
|
)
|
||||||
|
|
||||||
if not filters.get("include_expired_batches"):
|
if not filters.get("include_expired_batches"):
|
||||||
query = query.where((batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull()))
|
query = query.where((batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull()))
|
||||||
|
|
||||||
@@ -551,6 +559,13 @@ def get_batches_from_serial_and_batch_bundle(searchfields, txt, filters, start=0
|
|||||||
.limit(page_len)
|
.limit(page_len)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if not filters.get("is_inward"):
|
||||||
|
if filters.get("posting_date") and filters.get("posting_time"):
|
||||||
|
bundle_query = bundle_query.where(
|
||||||
|
stock_ledger_entry.posting_datetime
|
||||||
|
<= get_combine_datetime(filters.posting_date, filters.posting_time)
|
||||||
|
)
|
||||||
|
|
||||||
if not filters.get("include_expired_batches"):
|
if not filters.get("include_expired_batches"):
|
||||||
bundle_query = bundle_query.where(
|
bundle_query = bundle_query.where(
|
||||||
(batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull())
|
(batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull())
|
||||||
|
|||||||
@@ -484,6 +484,8 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
|
|||||||
warehouse:
|
warehouse:
|
||||||
this.item.s_warehouse || this.item.t_warehouse || this.item.warehouse,
|
this.item.s_warehouse || this.item.t_warehouse || this.item.warehouse,
|
||||||
is_inward: is_inward,
|
is_inward: is_inward,
|
||||||
|
posting_date: this.frm.doc.posting_date,
|
||||||
|
posting_time: this.frm.doc.posting_time,
|
||||||
include_expired_batches: include_expired_batches,
|
include_expired_batches: include_expired_batches,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
1
frappe-semgrep-rules
Submodule
1
frappe-semgrep-rules
Submodule
Submodule frappe-semgrep-rules added at a05bce32ad
Reference in New Issue
Block a user