diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py index 8314e52006fc01502441d337076923444e8175d9..ed18021e0d7929e2981d2aa1a6e162cad8cd96e7 100644 --- a/erpnext/stock/deprecated_serial_batch.py +++ b/erpnext/stock/deprecated_serial_batch.py @@ -286,7 +286,6 @@ class DeprecatedBatchNoValuation: from erpnext.stock.utils import get_combine_datetime 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) if not self.sle.creation: @@ -301,8 +300,6 @@ class DeprecatedBatchNoValuation: query = ( frappe.qb.from_(sle) - .inner_join(batch) - .on(sle.batch_no == batch.name) .select( sle.stock_value, sle.qty_after_transaction, @@ -310,7 +307,6 @@ class DeprecatedBatchNoValuation: .where( (sle.item_code == self.sle.item_code) & (sle.warehouse == self.sle.warehouse) - & (sle.batch_no.isnotnull()) & (sle.is_cancelled == 0) ) .where(timestamp_condition) diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json index 7707d791431656b928dead469ce5fc1cb4e53028..ea497f7ab7a8d4dbb5d61db7f8741da47c2da6cf 100644 --- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json +++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json @@ -250,6 +250,7 @@ }, { "depends_on": "eval:doc.uom != doc.stock_uom", + "fetch_from": "item_code.stock_uom", "fieldname": "stock_uom", "fieldtype": "Link", "label": "Stock UOM", @@ -588,7 +589,8 @@ "label": "Serial and Batch Bundle", "no_copy": 1, "options": "Serial and Batch Bundle", - "print_hide": 1 + "print_hide": 1, + "search_index": 1 }, { "default": "0", @@ -606,17 +608,19 @@ "fieldtype": "Column Break" } ], + "grid_page_length": 50, "idx": 1, "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-03-27 13:10:44.056282", + "modified": "2025-03-26 21:00:58.544797", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry Detail", "naming_rule": "Random", "owner": "Administrator", "permissions": [], + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "ASC", "states": []