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

Merge pull request #46740 from frappe/mergify/bp/version-15-hotfix/pr-46739

Browse Source 
fix: slow query (backport #46739)
This commit is contained in:
rohitwaghchaure
2025-03-26 22:38:38 +05:30
committed by GitHub
parent af3b871989 41f20a9c64
commit 8b5ed20225
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/deprecated_serial_batch.py
View File

@@ -252,7 +252,6 @@ class DeprecatedBatchNoValuation:
from erpnext.stock.utils import get_combine_datetime from erpnext.stock.utils import get_combine_datetime
sle = frappe.qb.DocType("Stock Ledger Entry") sle = frappe.qb.DocType("Stock Ledger Entry")
batch = frappe.qb.DocType("Batch")
posting_datetime = get_combine_datetime(self.sle.posting_date, self.sle.posting_time) posting_datetime = get_combine_datetime(self.sle.posting_date, self.sle.posting_time)
if not self.sle.creation: if not self.sle.creation:
@@ -267,8 +266,6 @@ class DeprecatedBatchNoValuation:
query = ( query = (
frappe.qb.from_(sle) frappe.qb.from_(sle)
.inner_join(batch)
.on(sle.batch_no == batch.name)
.select( .select(
sle.stock_value, sle.stock_value,
sle.qty_after_transaction, sle.qty_after_transaction,
@@ -276,7 +273,6 @@ class DeprecatedBatchNoValuation:
.where( .where(
(sle.item_code == self.sle.item_code) (sle.item_code == self.sle.item_code)
& (sle.warehouse == self.sle.warehouse) & (sle.warehouse == self.sle.warehouse)
& (sle.batch_no.isnotnull())
& (sle.is_cancelled == 0) & (sle.is_cancelled == 0)
) )
.where(timestamp_condition) .where(timestamp_condition)

7
erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
View File

@@ -250,6 +250,7 @@
}, },
{ {
"depends_on": "eval:doc.uom != doc.stock_uom", "depends_on": "eval:doc.uom != doc.stock_uom",
"fetch_from": "item_code.stock_uom",
"fieldname": "stock_uom", "fieldname": "stock_uom",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Stock UOM", "label": "Stock UOM",
@@ -588,7 +589,8 @@
"label": "Serial and Batch Bundle", "label": "Serial and Batch Bundle",
"no_copy": 1, "no_copy": 1,
"options": "Serial and Batch Bundle", "options": "Serial and Batch Bundle",
"print_hide": 1 "print_hide": 1,
"search_index": 1
}, },
{ {
"default": "0", "default": "0",
@@ -606,11 +608,12 @@
"fieldtype": "Column Break" "fieldtype": "Column Break"
} }
], ],
"grid_page_length": 50,
"idx": 1, "idx": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2024-02-25 15:58:40.982582", "modified": "2025-03-26 21:01:58.544797",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry Detail", "name": "Stock Entry Detail",