Name
@@ -189,17 +213,18 @@ erpnext.PointOfSale.ItemSelector = class {
fieldtype: "Link",
options: "Item Group",
placeholder: __("Select item group"),
+ only_select: true,
onchange: function () {
me.item_group = this.value;
!me.item_group && (me.item_group = me.parent_item_group);
me.filter_items();
+ me.set_item_selector_filter_label(this.value);
},
get_query: function () {
- const doc = me.events.get_frm().doc;
return {
query: "erpnext.selling.page.point_of_sale.point_of_sale.item_group_query",
filters: {
- pos_profile: doc ? doc.pos_profile : "",
+ pos_profile: me.pos_profile,
},
};
},
@@ -210,9 +235,22 @@ erpnext.PointOfSale.ItemSelector = class {
this.search_field.toggle_label(false);
this.item_group_field.toggle_label(false);
+ $(this.item_group_field.awesomplete.ul).css("min-width", "unset");
+
+ this.hide_open_link_btn();
this.attach_clear_btn();
}
+ set_item_selector_filter_label(value) {
+ const $filter_label = this.$component.find(".label");
+
+ $filter_label.html(value ? __(value) : __("All Items"));
+ }
+
+ hide_open_link_btn() {
+ $(this.item_group_field.$wrapper.find(".btn-open")).css("display", "none");
+ }
+
attach_clear_btn() {
this.search_field.$wrapper.find(".control-input").append(
`
@@ -222,12 +260,24 @@ erpnext.PointOfSale.ItemSelector = class {
`
);
+ this.item_group_field.$wrapper.find(".link-btn").append(
+ `
+ ${frappe.utils.icon("close", "xs", "es-icon")}
+ `
+ );
+
this.$clear_search_btn = this.search_field.$wrapper.find(".link-btn");
+ this.$clear_item_group_btn = this.item_group_field.$wrapper.find(".btn-clear");
this.$clear_search_btn.on("click", "a", () => {
this.set_search_value("");
this.search_field.set_focus();
});
+
+ this.$clear_item_group_btn.on("click", () => {
+ $(this.item_group_field.$input[0]).val("").trigger("input");
+ this.item_group_field.set_focus();
+ });
}
set_search_value(value) {
@@ -359,6 +409,8 @@ erpnext.PointOfSale.ItemSelector = class {
}
filter_items({ search_term = "" } = {}) {
+ this.start_item_loading_animation();
+
const selling_price_list = this.events.get_frm().doc.selling_price_list;
if (search_term) {
@@ -379,19 +431,31 @@ erpnext.PointOfSale.ItemSelector = class {
}
}
- this.get_items({ search_term }).then(({ message }) => {
- // eslint-disable-next-line no-unused-vars
- const { items, serial_no, batch_no, barcode } = message;
- if (search_term && !barcode) {
- this.search_index[selling_price_list][search_term] = items;
- }
- this.items = items;
- this.render_item_list(items);
- this.auto_add_item &&
- this.search_field.$input[0].value &&
- this.items.length == 1 &&
- this.add_filtered_item_to_cart();
- });
+ this.get_items({ search_term })
+ .then(({ message }) => {
+ // eslint-disable-next-line no-unused-vars
+ const { items, serial_no, batch_no, barcode } = message;
+ if (search_term && !barcode) {
+ this.search_index[selling_price_list][search_term] = items;
+ }
+ this.items = items;
+ this.render_item_list(items);
+ this.auto_add_item &&
+ this.search_field.$input[0].value &&
+ this.items.length == 1 &&
+ this.add_filtered_item_to_cart();
+ })
+ .always(() => {
+ this.stop_item_loading_animation();
+ });
+ }
+
+ start_item_loading_animation() {
+ this.$items_container.addClass("is-loading");
+ }
+
+ stop_item_loading_animation() {
+ this.$items_container.removeClass("is-loading");
}
add_filtered_item_to_cart() {
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index def469e4fa3..5a2b6db83f2 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -11,7 +11,16 @@ from frappe.cache_manager import clear_defaults_cache
from frappe.contacts.address_and_contact import load_address_and_contact
from frappe.custom.doctype.property_setter.property_setter import make_property_setter
from frappe.desk.page.setup_wizard.setup_wizard import make_records
-from frappe.utils import add_months, cint, formatdate, get_first_day, get_link_to_form, get_timestamp, today
+from frappe.utils import (
+ add_months,
+ cint,
+ formatdate,
+ get_first_day,
+ get_last_day,
+ get_link_to_form,
+ get_timestamp,
+ today,
+)
from frappe.utils.nestedset import NestedSet, rebuild_tree
from erpnext.accounts.doctype.account.account import get_account_currency
@@ -866,31 +875,41 @@ def install_country_fixtures(company, country):
def update_company_current_month_sales(company):
- from_date = get_first_day(today())
- to_date = get_first_day(add_months(from_date, 1))
+ """Update Company's Total Monthly Sales.
- results = frappe.db.sql(
- """
- SELECT
- SUM(base_grand_total) AS total,
- DATE_FORMAT(posting_date, '%%m-%%Y') AS month_year
- FROM
- `tabSales Invoice`
- WHERE
- posting_date >= %s
- AND posting_date < %s
- AND docstatus = 1
- AND company = %s
- GROUP BY
- month_year
- """,
- (from_date, to_date, company),
- as_dict=True,
+ Postgres compatibility:
+ - Avoid MariaDB-only DATE_FORMAT().
+ - Use a date range for the current month instead (portable + index-friendly).
+ """
+
+ # Local imports so you don't have to touch file-level imports
+ from frappe.query_builder.functions import Sum
+
+ start_date = get_first_day(today())
+ end_date = get_last_day(today())
+
+ si = frappe.qb.DocType("Sales Invoice")
+
+ total_monthly_sales = (
+ frappe.qb.from_(si)
+ .select(Sum(si.base_grand_total))
+ .where(
+ (si.docstatus == 1)
+ & (si.company == company)
+ & (si.posting_date >= start_date)
+ & (si.posting_date <= end_date)
+ )
+ ).run(pluck=True)[0] or 0
+
+ # Fieldname in standard ERPNext is `total_monthly_sales`
+ frappe.db.set_value(
+ "Company",
+ company,
+ "total_monthly_sales",
+ total_monthly_sales,
+ update_modified=False,
)
- monthly_total = results[0]["total"] if len(results) > 0 else 0
- frappe.db.set_value("Company", company, "total_monthly_sales", monthly_total)
-
def update_company_monthly_sales(company):
"""Cache past year monthly sales of every company based on sales invoices"""
diff --git a/erpnext/setup/doctype/uom/uom.js b/erpnext/setup/doctype/uom/uom.js
index 273e30fd197..eb61f63f034 100644
--- a/erpnext/setup/doctype/uom/uom.js
+++ b/erpnext/setup/doctype/uom/uom.js
@@ -1,7 +1,2 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-
-//--------- ONLOAD -------------
-cur_frm.cscript.onload = function (doc, cdt, cdn) {};
-
-cur_frm.cscript.refresh = function (doc, cdt, cdn) {};
diff --git a/erpnext/setup/workspace/settings/settings.json b/erpnext/setup/workspace/erpnext_settings/erpnext_settings.json
similarity index 96%
rename from erpnext/setup/workspace/settings/settings.json
rename to erpnext/setup/workspace/erpnext_settings/erpnext_settings.json
index 2ebb66e6518..745d0ad4d24 100644
--- a/erpnext/setup/workspace/settings/settings.json
+++ b/erpnext/setup/workspace/erpnext_settings/erpnext_settings.json
@@ -11,7 +11,7 @@
"icon": "setting",
"idx": 0,
"is_hidden": 0,
- "label": "Settings",
+ "label": "ERPNext Settings",
"links": [
{
"dependencies": "",
@@ -69,10 +69,10 @@
"type": "Link"
}
],
- "modified": "2025-11-18 13:20:51.473774",
+ "modified": "2026-01-09 13:05:08.007297",
"modified_by": "Administrator",
"module": "Setup",
- "name": "Settings",
+ "name": "ERPNext Settings",
"number_cards": [],
"owner": "Administrator",
"parent_page": "",
@@ -128,6 +128,6 @@
"type": "DocType"
}
],
- "title": "Settings",
+ "title": "ERPNext Settings",
"type": "Workspace"
}
diff --git a/erpnext/stock/dashboard_chart_source/stock_value_by_item_group/stock_value_by_item_group.py b/erpnext/stock/dashboard_chart_source/stock_value_by_item_group/stock_value_by_item_group.py
index 68f64619e7b..e2d0b1e41e8 100644
--- a/erpnext/stock/dashboard_chart_source/stock_value_by_item_group/stock_value_by_item_group.py
+++ b/erpnext/stock/dashboard_chart_source/stock_value_by_item_group/stock_value_by_item_group.py
@@ -53,12 +53,14 @@ def get_stock_value_by_item_group(company):
.inner_join(item_doctype)
.on(doctype.item_code == item_doctype.name)
.select(item_doctype.item_group, stock_value.as_("stock_value"))
- .where(doctype.warehouse.isin(warehouses))
.groupby(item_doctype.item_group)
.orderby(stock_value, order=frappe.qb.desc)
.limit(10)
)
+ if warehouses:
+ query = query.where(doctype.warehouse.isin(warehouses))
+
results = query.run(as_dict=True)
labels = []
diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py
index dd7a3830c9b..0fb3f048983 100644
--- a/erpnext/stock/deprecated_serial_batch.py
+++ b/erpnext/stock/deprecated_serial_batch.py
@@ -3,7 +3,7 @@ import json
from collections import defaultdict
import frappe
-from frappe.query_builder.functions import CombineDatetime, Sum
+from frappe.query_builder.functions import Sum
from frappe.utils import flt, nowtime
from pypika import Order
from pypika.functions import Coalesce
diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
index 79e9776b91c..62c4528f432 100644
--- a/erpnext/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -5,7 +5,7 @@
import frappe
from frappe.model.document import Document
from frappe.query_builder import Case, Order
-from frappe.query_builder.functions import Coalesce, CombineDatetime, Sum
+from frappe.query_builder.functions import Coalesce, Sum
from frappe.utils import flt
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 9b02ebe2f7a..d85a76f9f75 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -2806,6 +2806,64 @@ class TestDeliveryNote(IntegrationTestCase):
frappe.db.set_single_value("System Settings", "float_precision", original_flt_precision)
+ def test_different_rate_for_same_serial_nos(self):
+ item_code = make_item(
+ "Test Different Rate Serial No Item",
+ properties={"is_stock_item": 1, "has_serial_no": 1, "serial_no_series": "DRSN-.#####"},
+ ).name
+
+ se = make_stock_entry(item_code=item_code, target="_Test Warehouse - _TC", qty=1, basic_rate=100)
+ serial_nos = get_serial_nos_from_bundle(se.items[0].serial_and_batch_bundle)
+
+ dn = create_delivery_note(
+ item_code=item_code,
+ qty=1,
+ rate=300,
+ use_serial_batch_fields=1,
+ serial_no="\n".join(serial_nos),
+ )
+
+ dn.reload()
+
+ sabb = frappe.get_doc("Serial and Batch Bundle", dn.items[0].serial_and_batch_bundle)
+ for entry in sabb.entries:
+ self.assertEqual(entry.incoming_rate, 100)
+
+ make_stock_entry(
+ item_code=item_code,
+ target="_Test Warehouse - _TC",
+ qty=1,
+ basic_rate=200,
+ use_serial_batch_fields=1,
+ serial_no="\n".join(serial_nos),
+ )
+ dn1 = create_delivery_note(
+ item_code=item_code,
+ qty=1,
+ rate=300,
+ use_serial_batch_fields=1,
+ serial_no="\n".join(serial_nos),
+ )
+
+ dn1.reload()
+
+ sabb = frappe.get_doc("Serial and Batch Bundle", dn1.items[0].serial_and_batch_bundle)
+ for entry in sabb.entries:
+ self.assertEqual(entry.incoming_rate, 200)
+
+ doc = frappe.new_doc("Repost Item Valuation")
+ doc.voucher_type = "Stock Entry"
+ doc.voucher_no = se.name
+ doc.submit()
+
+ sabb = frappe.get_doc("Serial and Batch Bundle", dn.items[0].serial_and_batch_bundle)
+ for entry in sabb.entries:
+ self.assertEqual(entry.incoming_rate, 100)
+
+ sabb = frappe.get_doc("Serial and Batch Bundle", dn1.items[0].serial_and_batch_bundle)
+ for entry in sabb.entries:
+ self.assertEqual(entry.incoming_rate, 200)
+
def create_delivery_note(**args):
dn = frappe.new_doc("Delivery Note")
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index 56cdb427acd..6f13428c22b 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -116,6 +116,11 @@ frappe.ui.form.on("Item", {
},
__("View")
);
+
+ frm.toggle_display(
+ ["opening_stock"],
+ frappe.model.can_create("Stock Entry") && frappe.model.can_write("Stock Entry")
+ );
}
if (frm.doc.is_fixed_asset) {
@@ -239,6 +244,8 @@ frappe.ui.form.on("Item", {
},
};
});
+
+ frm.toggle_display(["standard_rate"], frappe.model.can_create("Item Price"));
},
validate: function (frm) {
@@ -1063,7 +1070,7 @@ frappe.tour["Item"] = [
fieldname: "valuation_rate",
title: "Valuation Rate",
description: __(
- "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit
Item Valuation, FIFO and Moving Average."
+ "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit
Item Valuation, FIFO and Moving Average."
),
},
{
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 5c92fecbfdf..feedb6a0f8a 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -183,7 +183,23 @@ class Item(Document):
self.add_price(default.default_price_list)
if self.opening_stock:
- self.set_opening_stock()
+ if self.opening_stock > 10000 and self.has_serial_no:
+ frappe.enqueue(
+ self.set_opening_stock,
+ queue="long",
+ timeout=600,
+ job_name=f"set_opening_stock_for_{self.name}",
+ )
+ frappe.msgprint(
+ _(
+ "Opening stock creation has been queued and will be created in the background. Please check the stock entry after some time."
+ ),
+ indicator="orange",
+ alert=True,
+ )
+
+ else:
+ self.set_opening_stock()
def validate(self):
if not self.item_name:
@@ -264,7 +280,11 @@ class Item(Document):
def set_opening_stock(self):
"""set opening stock"""
- if not self.is_stock_item or self.has_serial_no or self.has_batch_no:
+ if (
+ not self.is_stock_item
+ or (self.has_serial_no and not self.serial_no_series)
+ or (self.has_batch_no and (not self.create_new_batch or not self.batch_number_series))
+ ):
return
if not self.valuation_rate and not self.standard_rate and not self.is_customer_provided_item:
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index 7814efb1c0b..b259f6592c1 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -957,6 +957,43 @@ class TestItem(IntegrationTestCase):
msg="Different Variant UOM should not be allowed when `allow_different_uom` is disabled.",
)
+ def test_opening_stock_for_serial_batch(self):
+ items = {
+ "Test Opening Stock for Serial No": {
+ "has_serial_no": 1,
+ "opening_stock": 5,
+ "serial_no_series": "SN-TOPN-.####",
+ "valuation_rate": 100,
+ },
+ "Test Opening Stock for Batch No": {
+ "has_batch_no": 1,
+ "opening_stock": 5,
+ "batch_number_series": "BCH-TOPN-.####",
+ "valuation_rate": 100,
+ "create_new_batch": 1,
+ },
+ "Test Opening Stock for Serial and Batch No": {
+ "has_serial_no": 1,
+ "has_batch_no": 1,
+ "opening_stock": 5,
+ "batch_number_series": "SN-BCH-TOPN-.####",
+ "serial_no_series": "BCH-SN-TOPN-.####",
+ "valuation_rate": 100,
+ "create_new_batch": 1,
+ },
+ }
+
+ for item_code, properties in items.items():
+ make_item(item_code, properties)
+
+ serial_and_batch_bundle = frappe.db.get_value(
+ "Stock Entry Detail", {"docstatus": 1, "item_code": item_code}, "serial_and_batch_bundle"
+ )
+ self.assertTrue(serial_and_batch_bundle)
+
+ sabb_qty = frappe.db.get_value("Serial and Batch Bundle", serial_and_batch_bundle, "total_qty")
+ self.assertEqual(sabb_qty, properties["opening_stock"])
+
def set_item_variant_settings(fields):
doc = frappe.get_doc("Item Variant Settings")
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 02183bcfad3..b34bc7ded7d 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -366,16 +366,19 @@
},
{
"default": "0",
+ "depends_on": "auto_created_via_reorder",
"fieldname": "auto_created_via_reorder",
"fieldtype": "Check",
- "label": "Auto Created (Reorder)"
+ "label": "Auto Created (Reorder)",
+ "no_copy": 1,
+ "read_only": 1
}
],
"icon": "fa fa-ticket",
"idx": 70,
"is_submittable": 1,
"links": [],
- "modified": "2025-12-02 13:56:33.001436",
+ "modified": "2026-01-10 15:34:59.000603",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",
diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index 93f27d1c382..24a30581188 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -1138,7 +1138,8 @@ def make_material_request(**args):
mr = frappe.new_doc("Material Request")
mr.material_request_type = args.material_request_type or "Purchase"
mr.company = args.company or "_Test Company"
- mr.customer = args.customer or "_Test Customer"
+ if mr.material_request_type == "Customer Provided":
+ mr.customer = args.customer or "_Test Customer"
mr.append(
"items",
{
@@ -1147,6 +1148,7 @@ def make_material_request(**args):
"uom": args.uom or "_Test UOM",
"conversion_factor": args.conversion_factor or 1,
"schedule_date": args.schedule_date or today(),
+ "from_warehouse": args.from_warehouse,
"warehouse": args.warehouse or "_Test Warehouse - _TC",
"cost_center": args.cost_center or "_Test Cost Center - _TC",
},
diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py
index d1a273f12a8..d9b1d29e5aa 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.py
+++ b/erpnext/stock/doctype/pick_list/pick_list.py
@@ -400,7 +400,7 @@ class PickList(TransactionBase):
picked_items = get_picked_items_qty(packed_items, contains_packed_items=True)
self.validate_picked_qty(picked_items)
- doc_updates = {}
+ doc_updates = {item: {"picked_qty": 0} for item in set(packed_items)}
for d in picked_items:
doc_updates[d.product_bundle_item] = {"picked_qty": flt(d.picked_qty)}
@@ -411,7 +411,7 @@ class PickList(TransactionBase):
picked_items = get_picked_items_qty(so_items)
self.validate_picked_qty(picked_items)
- doc_updates = {}
+ doc_updates = {item: {"picked_qty": 0} for item in set(so_items)}
for d in picked_items:
doc_updates[d.sales_order_item] = {"picked_qty": flt(d.picked_qty)}
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index b5c1c38729f..81c1b147697 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -266,7 +266,7 @@ erpnext.stock.PurchaseReceiptController = class PurchaseReceiptController extend
);
}
cur_frm.add_custom_button(
- __("Retention Stock Entry"),
+ __("Sample Retention Stock Entry"),
this.make_retention_stock_entry,
__("Create")
);
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 6ee22025565..b26bab3d1c4 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -4849,6 +4849,154 @@ class TestPurchaseReceipt(IntegrationTestCase):
self.assertEqual(return_entry.items[0].qty, -2)
self.assertEqual(return_entry.items[0].rejected_qty, 0) # 3-3=0
+ def test_do_not_use_batchwise_valuation_with_fifo(self):
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+
+ item_code = make_item(
+ "Test Item Do Not Use Batchwise Valuation with FIFO",
+ {
+ "is_stock_item": 1,
+ "has_batch_no": 1,
+ "batch_number_series": "BN-TESTDNUBVWF-.#####",
+ "valuation_method": "FIFO",
+ },
+ ).name
+
+ doc = frappe.new_doc("Batch")
+ doc.update(
+ {
+ "batch_id": "BN-TESTDNUBVWF-00001",
+ "item": item_code,
+ }
+ ).insert()
+
+ doc.db_set("use_batchwise_valuation", 0)
+ doc.reload()
+
+ self.assertTrue(doc.use_batchwise_valuation == 0)
+
+ doc = frappe.new_doc("Batch")
+ doc.update(
+ {
+ "batch_id": "BN-TESTDNUBVWF-00002",
+ "item": item_code,
+ }
+ ).insert()
+
+ self.assertTrue(doc.use_batchwise_valuation == 1)
+
+ warehouse = "_Test Warehouse - _TC"
+ make_stock_entry(
+ item_code=item_code,
+ qty=10,
+ rate=100,
+ target=warehouse,
+ batch_no="BN-TESTDNUBVWF-00001",
+ use_serial_batch_fields=1,
+ )
+
+ se1 = make_stock_entry(
+ item_code=item_code,
+ qty=10,
+ rate=200,
+ target=warehouse,
+ batch_no="BN-TESTDNUBVWF-00001",
+ use_serial_batch_fields=1,
+ )
+
+ stock_queue = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "is_cancelled": 0,
+ "voucher_type": "Stock Entry",
+ "voucher_no": se1.name,
+ },
+ "stock_queue",
+ )
+
+ stock_queue = frappe.parse_json(stock_queue)
+
+ self.assertEqual(stock_queue, [[10, 100.0], [10, 200.0]])
+
+ se2 = make_stock_entry(
+ item_code=item_code,
+ qty=10,
+ rate=2,
+ target=warehouse,
+ batch_no="BN-TESTDNUBVWF-00002",
+ use_serial_batch_fields=1,
+ )
+
+ stock_queue = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "is_cancelled": 0,
+ "voucher_type": "Stock Entry",
+ "voucher_no": se2.name,
+ },
+ "stock_queue",
+ )
+
+ stock_queue = frappe.parse_json(stock_queue)
+ self.assertEqual(stock_queue, [[10, 100.0], [10, 200.0]])
+
+ se3 = make_stock_entry(
+ item_code=item_code,
+ qty=20,
+ source=warehouse,
+ batch_no="BN-TESTDNUBVWF-00001",
+ use_serial_batch_fields=1,
+ )
+
+ ste_details = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "is_cancelled": 0,
+ "voucher_type": "Stock Entry",
+ "voucher_no": se3.name,
+ },
+ ["stock_queue", "stock_value_difference"],
+ as_dict=1,
+ )
+
+ stock_queue = frappe.parse_json(ste_details.stock_queue)
+ self.assertEqual(stock_queue, [])
+ self.assertEqual(ste_details.stock_value_difference, 3000 * -1)
+
+ se4 = make_stock_entry(
+ item_code=item_code,
+ qty=20,
+ rate=0,
+ target=warehouse,
+ batch_no="BN-TESTDNUBVWF-00001",
+ use_serial_batch_fields=1,
+ do_not_submit=1,
+ )
+
+ se4.items[0].basic_rate = 0.0
+ se4.items[0].allow_zero_valuation_rate = 1
+ se4.submit()
+
+ stock_queue = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "is_cancelled": 0,
+ "voucher_type": "Stock Entry",
+ "voucher_no": se4.name,
+ },
+ "stock_queue",
+ )
+
+ self.assertEqual(frappe.parse_json(stock_queue), [[20, 0.0]])
+
def prepare_data_for_internal_transfer():
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
index 5a749b31f62..458df2fec38 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
@@ -12,7 +12,7 @@ import frappe.query_builder.functions
from frappe import _, _dict, bold
from frappe.model.document import Document
from frappe.model.naming import make_autoname
-from frappe.query_builder.functions import CombineDatetime, Sum
+from frappe.query_builder.functions import Sum
from frappe.utils import (
cint,
cstr,
@@ -118,10 +118,19 @@ class SerialandBatchBundle(Document):
return
self.allow_existing_serial_nos()
- if not self.flags.ignore_validate_serial_batch or frappe.in_test:
- self.validate_serial_nos_duplicate()
+ if self.docstatus == 1:
+ if not self.flags.ignore_validate_serial_batch or frappe.in_test:
+ self.validate_serial_nos_duplicate()
+
+ self.check_future_entries_exists()
+ elif (
+ self.has_serial_no
+ and self.type_of_transaction == "Outward"
+ and self.voucher_type != "Stock Reconciliation"
+ and self.voucher_no
+ ):
+ self.validate_serial_no_status()
- self.check_future_entries_exists()
self.set_is_outward()
self.calculate_total_qty()
self.set_warehouse()
@@ -130,6 +139,26 @@ class SerialandBatchBundle(Document):
self.set_incoming_rate()
self.calculate_qty_and_amount()
+ self.set_child_details()
+
+ def validate_serial_no_status(self):
+ serial_nos = [d.serial_no for d in self.entries if d.serial_no]
+ invalid_serial_nos = frappe.get_all(
+ "Serial No",
+ filters={
+ "name": ("in", serial_nos),
+ "warehouse": ("!=", self.warehouse),
+ },
+ pluck="name",
+ )
+
+ if invalid_serial_nos:
+ msg = _(
+ "You cannot outward following {0} as either they are Delivered, Inactive or located in a different warehouse."
+ ).format(_("Serial Nos") if len(invalid_serial_nos) > 1 else _("Serial No"))
+ msg += "
"
+ msg += ", ".join(sn for sn in invalid_serial_nos)
+ frappe.throw(msg)
def validate_voucher_detail_no(self):
if self.type_of_transaction not in ["Inward", "Outward"] or self.voucher_type in [
@@ -683,17 +712,16 @@ class SerialandBatchBundle(Document):
is_packed_item = True
stock_queue = []
- batches = []
- if prev_sle and prev_sle.stock_queue:
- batches = frappe.get_all(
- "Batch",
- filters={
- "name": ("in", [d.batch_no for d in self.entries if d.batch_no]),
- "use_batchwise_valuation": 0,
- },
- pluck="name",
- )
+ batches = frappe.get_all(
+ "Batch",
+ filters={
+ "name": ("in", [d.batch_no for d in self.entries if d.batch_no]),
+ "use_batchwise_valuation": 0,
+ },
+ pluck="name",
+ )
+ if prev_sle and prev_sle.stock_queue and parse_json(prev_sle.stock_queue):
if batches and valuation_method == "FIFO":
stock_queue = parse_json(prev_sle.stock_queue)
@@ -701,10 +729,16 @@ class SerialandBatchBundle(Document):
"Buying Settings", "set_valuation_rate_for_rejected_materials"
)
+ precision = frappe.get_precision("Serial and Batch Entry", "incoming_rate")
for d in self.entries:
if self.is_rejected and not set_valuation_rate_for_rejected_materials:
rate = 0.0
- elif (d.incoming_rate == rate) and not stock_queue and d.qty and d.stock_value_difference:
+ elif (
+ (flt(d.incoming_rate, precision) == flt(rate, precision))
+ and not stock_queue
+ and d.qty
+ and d.stock_value_difference
+ ):
continue
if is_packed_item and d.incoming_rate:
@@ -714,7 +748,7 @@ class SerialandBatchBundle(Document):
if d.qty:
d.stock_value_difference = flt(d.qty) * d.incoming_rate
- if stock_queue and valuation_method == "FIFO" and d.batch_no in batches:
+ if valuation_method == "FIFO" and d.batch_no in batches and d.incoming_rate is not None:
stock_queue.append([d.qty, d.incoming_rate])
d.stock_queue = json.dumps(stock_queue)
@@ -764,7 +798,7 @@ class SerialandBatchBundle(Document):
self.calculate_total_qty(save=True)
# If user has changed the rate in the child table
- if self.docstatus == 0:
+ if self.docstatus == 0 and self.type_of_transaction == "Inward":
self.set_incoming_rate(parent=parent, row=row, save=True)
if self.docstatus == 0 and parent.get("is_return") and parent.is_new():
@@ -1308,8 +1342,18 @@ class SerialandBatchBundle(Document):
self.set_source_document_no()
def on_submit(self):
+ self.validate_docstatus()
self.validate_serial_nos_inventory()
+ def validate_docstatus(self):
+ for row in self.entries:
+ if row.docstatus != 1:
+ frappe.throw(
+ _("At Row {0}: In Serial and Batch Bundle {1} must have docstatus as 1 and not 0").format(
+ bold(row.idx), bold(self.name)
+ )
+ )
+
def set_child_details(self):
for row in self.entries:
for field in [
@@ -1319,6 +1363,7 @@ class SerialandBatchBundle(Document):
"voucher_no",
"voucher_detail_no",
"type_of_transaction",
+ "item_code",
]:
if not row.get(field) or row.get(field) != self.get(field):
row.set(field, self.get(field))
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
index 4d188eb2e93..8cbb59599b7 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
@@ -988,6 +988,7 @@ def make_serial_batch_bundle(kwargs):
"type_of_transaction": type_of_transaction,
"company": kwargs.company or "_Test Company",
"do_not_submit": kwargs.do_not_submit,
+ "ignore_sabb_validation": kwargs.ignore_sabb_validation or False,
}
)
diff --git a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
index 69aaf261945..b5d0200c1c2 100644
--- a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
+++ b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
@@ -7,6 +7,7 @@
"field_order": [
"serial_no",
"batch_no",
+ "item_code",
"column_break_2",
"qty",
"warehouse",
@@ -22,6 +23,7 @@
"reference_for_reservation",
"voucher_type",
"voucher_no",
+ "is_cancelled",
"column_break_eykr",
"posting_datetime",
"type_of_transaction",
@@ -146,24 +148,28 @@
"fieldname": "posting_datetime",
"fieldtype": "Datetime",
"label": "Posting Datetime",
+ "no_copy": 1,
"read_only": 1
},
{
"fieldname": "voucher_type",
"fieldtype": "Data",
"label": "Voucher Type",
+ "no_copy": 1,
"read_only": 1
},
{
"fieldname": "voucher_no",
"fieldtype": "Data",
"label": "Voucher No",
+ "no_copy": 1,
"read_only": 1
},
{
"fieldname": "voucher_detail_no",
"fieldtype": "Data",
"label": "Voucher Detail No",
+ "no_copy": 1,
"read_only": 1,
"search_index": 1
},
@@ -171,18 +177,35 @@
"fieldname": "type_of_transaction",
"fieldtype": "Data",
"label": "Type of Transaction",
+ "no_copy": 1,
"read_only": 1,
"search_index": 1
},
{
"fieldname": "column_break_eykr",
"fieldtype": "Column Break"
+ },
+ {
+ "default": "0",
+ "fieldname": "is_cancelled",
+ "fieldtype": "Check",
+ "label": "Is Cancelled",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "label": "Item Code",
+ "no_copy": 1,
+ "options": "Item",
+ "read_only": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2025-11-09 23:28:35.191959",
+ "modified": "2026-01-11 11:05:10.789054",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial and Batch Entry",
diff --git a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.py b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.py
index 1f084e60c9c..adeb6a388da 100644
--- a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.py
+++ b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.py
@@ -17,7 +17,9 @@ class SerialandBatchEntry(Document):
batch_no: DF.Link | None
delivered_qty: DF.Float
incoming_rate: DF.Float
+ is_cancelled: DF.Check
is_outward: DF.Check
+ item_code: DF.Link | None
outgoing_rate: DF.Float
parent: DF.Data
parentfield: DF.Data
diff --git a/erpnext/stock/doctype/shipment/shipment.json b/erpnext/stock/doctype/shipment/shipment.json
index 9d7882f7094..a5e0a2377cf 100644
--- a/erpnext/stock/doctype/shipment/shipment.json
+++ b/erpnext/stock/doctype/shipment/shipment.json
@@ -115,7 +115,7 @@
},
{
"fieldname": "pickup_address",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"read_only": 1
},
{
@@ -135,7 +135,7 @@
},
{
"fieldname": "pickup_contact",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"read_only": 1
},
{
@@ -193,7 +193,7 @@
},
{
"fieldname": "delivery_address",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"read_only": 1
},
{
@@ -214,7 +214,7 @@
{
"depends_on": "eval:doc.delivery_contact_name",
"fieldname": "delivery_contact",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"read_only": 1
},
{
@@ -382,6 +382,7 @@
"print_hide": 1
},
{
+ "allow_on_submit": 1,
"fieldname": "tracking_status",
"fieldtype": "Select",
"label": "Tracking Status",
@@ -440,11 +441,11 @@
],
"is_submittable": 1,
"links": [],
- "modified": "2025-02-20 16:55:20.076418",
+ "modified": "2026-01-16 14:59:28.547953",
"modified_by": "Administrator",
"module": "Stock",
"name": "Shipment",
- "naming_rule": "Expression (old style)",
+ "naming_rule": "Expression",
"owner": "Administrator",
"permissions": [
{
@@ -476,8 +477,9 @@
"write": 1
}
],
+ "row_format": "Dynamic",
"sort_field": "creation",
"sort_order": "DESC",
"states": [],
"track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/shipment/shipment.py b/erpnext/stock/doctype/shipment/shipment.py
index f638d6125fe..ae5a4214d24 100644
--- a/erpnext/stock/doctype/shipment/shipment.py
+++ b/erpnext/stock/doctype/shipment/shipment.py
@@ -20,19 +20,17 @@ class Shipment(Document):
if TYPE_CHECKING:
from frappe.types import DF
- from erpnext.stock.doctype.shipment_delivery_note.shipment_delivery_note import (
- ShipmentDeliveryNote,
- )
+ from erpnext.stock.doctype.shipment_delivery_note.shipment_delivery_note import ShipmentDeliveryNote
from erpnext.stock.doctype.shipment_parcel.shipment_parcel import ShipmentParcel
amended_from: DF.Link | None
awb_number: DF.Data | None
carrier: DF.Data | None
carrier_service: DF.Data | None
- delivery_address: DF.SmallText | None
+ delivery_address: DF.TextEditor | None
delivery_address_name: DF.Link
delivery_company: DF.Link | None
- delivery_contact: DF.SmallText | None
+ delivery_contact: DF.TextEditor | None
delivery_contact_email: DF.Data | None
delivery_contact_name: DF.Link | None
delivery_customer: DF.Link | None
@@ -44,10 +42,10 @@ class Shipment(Document):
pallets: DF.Literal["No", "Yes"]
parcel_template: DF.Link | None
pickup: DF.Data | None
- pickup_address: DF.SmallText | None
+ pickup_address: DF.TextEditor | None
pickup_address_name: DF.Link
pickup_company: DF.Link | None
- pickup_contact: DF.SmallText | None
+ pickup_contact: DF.TextEditor | None
pickup_contact_email: DF.Data | None
pickup_contact_name: DF.Link | None
pickup_contact_person: DF.Link | None
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index d106d097256..7d2ae01357a 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -440,12 +440,16 @@ frappe.ui.form.on("Stock Entry", {
if (
frm.doc.docstatus == 1 &&
- frm.doc.purpose == "Material Receipt" &&
+ ["Material Receipt", "Manufacture"].includes(frm.doc.purpose) &&
frm.get_sum("items", "sample_quantity")
) {
- frm.add_custom_button(__("Create Sample Retention Stock Entry"), function () {
- frm.trigger("make_retention_stock_entry");
- });
+ frm.add_custom_button(
+ __("Sample Retention Stock Entry"),
+ function () {
+ frm.trigger("make_retention_stock_entry");
+ },
+ __("Create")
+ );
}
frm.trigger("setup_quality_inspection");
@@ -568,10 +572,6 @@ frappe.ui.form.on("Stock Entry", {
if (r.message) {
var doc = frappe.model.sync(r.message)[0];
frappe.set_route("Form", doc.doctype, doc.name);
- } else {
- frappe.msgprint(
- __("Retention Stock Entry already created or Sample Quantity not provided")
- );
}
},
});
@@ -1054,7 +1054,7 @@ frappe.ui.form.on("Stock Entry Detail", {
var validate_sample_quantity = function (frm, cdt, cdn) {
var d = locals[cdt][cdn];
- if (d.sample_quantity && frm.doc.purpose == "Material Receipt") {
+ if (d.sample_quantity && d.transfer_qty && frm.doc.purpose == "Material Receipt") {
frappe.call({
method: "erpnext.stock.doctype.stock_entry.stock_entry.validate_sample_quantity",
args: {
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 215ad6d2ee9..fbcc43231dd 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -2570,6 +2570,7 @@ class StockEntry(StockController, SubcontractingInwardController):
"expense_account": expense_account,
"cost_center": item.get("buying_cost_center"),
"is_finished_item": 1,
+ "sample_quantity": item.get("sample_quantity"),
}
if (
@@ -3103,6 +3104,7 @@ class StockEntry(StockController, SubcontractingInwardController):
se_child.po_detail = item_row.get("po_detail")
se_child.sco_rm_detail = item_row.get("sco_rm_detail")
se_child.scio_detail = item_row.get("scio_detail")
+ se_child.sample_quantity = item_row.get("sample_quantity", 0)
for field in [
self.subcontract_data.rm_detail_field,
@@ -3238,7 +3240,7 @@ class StockEntry(StockController, SubcontractingInwardController):
stock_entries_child_list.append(d.ste_detail)
transferred_qty = frappe.get_all(
"Stock Entry Detail",
- fields=[{"SUM": "qty", "as": "qty"}],
+ fields=[{"SUM": "transfer_qty", "as": "qty"}],
filters={
"against_stock_entry": d.against_stock_entry,
"ste_detail": d.ste_detail,
@@ -3408,13 +3410,14 @@ class StockEntry(StockController, SubcontractingInwardController):
@frappe.whitelist()
def move_sample_to_retention_warehouse(company, items):
- from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
- get_batch_from_bundle,
+ from erpnext.stock.serial_batch_bundle import (
+ SerialBatchCreation,
+ get_batch_nos,
)
- from erpnext.stock.serial_batch_bundle import SerialBatchCreation
if isinstance(items, str):
items = json.loads(items)
+
retention_warehouse = frappe.get_single_value("Stock Settings", "sample_retention_warehouse")
stock_entry = frappe.new_doc("Stock Entry")
stock_entry.company = company
@@ -3422,38 +3425,64 @@ def move_sample_to_retention_warehouse(company, items):
stock_entry.set_stock_entry_type()
for item in items:
if item.get("sample_quantity") and item.get("serial_and_batch_bundle"):
- batch_no = get_batch_from_bundle(item.get("serial_and_batch_bundle"))
- sample_quantity = validate_sample_quantity(
- item.get("item_code"),
- item.get("sample_quantity"),
- item.get("transfer_qty") or item.get("qty"),
- batch_no,
+ warehouse = item.get("t_warehouse") or item.get("warehouse")
+ total_qty = 0
+ cls_obj = SerialBatchCreation(
+ {
+ "type_of_transaction": "Outward",
+ "serial_and_batch_bundle": item.get("serial_and_batch_bundle"),
+ "item_code": item.get("item_code"),
+ "warehouse": warehouse,
+ "do_not_save": True,
+ }
)
-
- if sample_quantity:
- cls_obj = SerialBatchCreation(
- {
- "type_of_transaction": "Outward",
- "serial_and_batch_bundle": item.get("serial_and_batch_bundle"),
- "item_code": item.get("item_code"),
- "warehouse": item.get("t_warehouse"),
- }
+ sabb = cls_obj.duplicate_package()
+ batches = get_batch_nos(item.get("serial_and_batch_bundle"))
+ sabe_list = []
+ for batch_no in batches.keys():
+ sample_quantity = validate_sample_quantity(
+ item.get("item_code"),
+ item.get("sample_quantity"),
+ item.get("transfer_qty") or item.get("qty"),
+ batch_no,
)
- cls_obj.duplicate_package()
+ sabe = next(item for item in sabb.entries if item.batch_no == batch_no)
+ if sample_quantity:
+ if sabb.has_serial_no:
+ new_sabe = [
+ entry
+ for entry in sabb.entries
+ if entry.batch_no == batch_no
+ and frappe.db.exists(
+ "Serial No", {"name": entry.serial_no, "warehouse": warehouse}
+ )
+ ][: int(sample_quantity)]
+ sabe_list.extend(new_sabe)
+ total_qty += len(new_sabe)
+ else:
+ total_qty += sample_quantity
+ sabe.qty = sample_quantity
+ else:
+ sabb.entries.remove(sabe)
+
+ if total_qty:
+ if sabe_list:
+ sabb.entries = sabe_list
+ sabb.save()
stock_entry.append(
"items",
{
"item_code": item.get("item_code"),
- "s_warehouse": item.get("t_warehouse"),
+ "s_warehouse": warehouse,
"t_warehouse": retention_warehouse,
- "qty": item.get("sample_quantity"),
+ "qty": total_qty,
"basic_rate": item.get("valuation_rate"),
"uom": item.get("uom"),
"stock_uom": item.get("stock_uom"),
"conversion_factor": item.get("conversion_factor") or 1.0,
- "serial_and_batch_bundle": cls_obj.serial_and_batch_bundle,
+ "serial_and_batch_bundle": sabb.name,
},
)
if stock_entry.get("items"):
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
index 576d129ee2d..6e54fd4e3b9 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
@@ -190,6 +190,7 @@ def make_stock_entry(**args):
"cost_center": args.cost_center,
"expense_account": args.expense_account,
"use_serial_batch_fields": args.use_serial_batch_fields,
+ "sample_quantity": frappe.get_value("Item", args.item, "sample_quantity") or 0,
},
)
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index a3e0aea07be..a0ac4f180b2 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -14,6 +14,13 @@ from erpnext.stock.doctype.item.test_item import (
make_item_variant,
set_item_variant_settings,
)
+from erpnext.stock.doctype.material_request.material_request import (
+ make_in_transit_stock_entry,
+)
+from erpnext.stock.doctype.material_request.test_material_request import (
+ get_in_transit_warehouse,
+ make_material_request,
+)
from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
get_batch_from_bundle,
get_serial_nos_from_bundle,
@@ -2190,6 +2197,126 @@ class TestStockEntry(IntegrationTestCase):
self.assertEqual(se.purpose, "Repack")
self.assertRaises(frappe.ValidationError, se.submit)
+ def test_transferred_qty_in_material_transfer(self):
+ item_code = "_Test Item"
+ source_warehouse = "_Test Warehouse - _TC"
+ target_warehouse = "_Test Warehouse 1 - _TC"
+
+ if not frappe.db.get_value("UOM Conversion Detail", {"parent": item_code, "uom": "Box"}):
+ item_doc = frappe.get_doc("Item", item_code)
+ item_doc.append("uoms", {"uom": "Box", "conversion_factor": 12})
+ item_doc.save(ignore_permissions=True)
+
+ make_stock_entry(item_code=item_code, target=source_warehouse, qty=12, rate=100)
+
+ # Create a Material Request for Material Transfer
+ material_request = make_material_request(
+ material_request_type="Material Transfer",
+ qty=1,
+ item_code=item_code,
+ uom="Box",
+ conversion_factor=12,
+ from_warehouse=source_warehouse,
+ warehouse=target_warehouse,
+ )
+ in_transit_wh = get_in_transit_warehouse(material_request.company)
+
+ # Create first Stock Entry (Source -> In-Transit)
+ stock_entry_1 = make_in_transit_stock_entry(material_request.name, in_transit_wh)
+ stock_entry_1.items[0].update(
+ {
+ "qty": 1,
+ "s_warehouse": source_warehouse,
+ }
+ )
+ stock_entry_1.save().submit()
+
+ # Validate transfer status after first transfer
+ material_request.reload()
+ self.assertEqual(material_request.transfer_status, "In Transit")
+
+ # Create final Stock Entry (In-Transit -> Target)
+ end_transit_1 = make_stock_in_entry(stock_entry_1.name)
+ end_transit_1.save().submit()
+ end_transit_1.reload()
+
+ # Validate quantities
+ stock_entry_1.reload()
+ self.assertEqual(stock_entry_1.items[0].qty, 1)
+ self.assertEqual(stock_entry_1.items[0].transfer_qty, 12)
+ self.assertEqual(stock_entry_1.items[0].transferred_qty, 12)
+
+ # Validate transfer status after final transfer
+ material_request.reload()
+ self.assertEqual(material_request.transfer_status, "Completed")
+
+ def test_manufacture_entry_without_wo(self):
+ from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom
+
+ fg_item = make_item("_Mobiles", properties={"is_stock_item": 1}).name
+ rm_item1 = make_item("_Temper Glass", properties={"is_stock_item": 1}).name
+ rm_item2 = make_item("_Battery", properties={"is_stock_item": 1}).name
+ warehouse = "_Test Warehouse - _TC"
+ make_stock_entry(item_code=rm_item1, target=warehouse, qty=5, purpose="Material Receipt")
+ make_stock_entry(item_code=rm_item2, target=warehouse, qty=5, purpose="Material Receipt")
+
+ bom_no = make_bom(item=fg_item, raw_materials=[rm_item1, rm_item2]).name
+ se = make_stock_entry(item_code=fg_item, qty=1, purpose="Manufacture", do_not_save=True)
+ se.from_bom = 1
+ se.use_multi_level_bom = 1
+ se.bom_no = bom_no
+ se.fg_completed_qty = 1
+ se.from_warehouse = warehouse
+ se.to_warehouse = warehouse
+
+ se.get_items()
+ rm_items = {d.item_code: d.qty for d in se.items if d.item_code != fg_item}
+ self.assertEqual(rm_items[rm_item1], 1)
+ self.assertEqual(rm_items[rm_item2], 1)
+ se.calculate_rate_and_amount()
+ se.save()
+ se.submit()
+
+ @IntegrationTestCase.change_settings(
+ "Stock Settings", {"sample_retention_warehouse": "_Test Warehouse 1 - _TC"}
+ )
+ def test_sample_retention_stock_entry(self):
+ from erpnext.stock.doctype.stock_entry.stock_entry import move_sample_to_retention_warehouse
+
+ warehouse = "_Test Warehouse - _TC"
+ retain_sample_item = make_item(
+ "Retain Sample Item",
+ properties={
+ "is_stock_item": 1,
+ "retain_sample": 1,
+ "sample_quantity": 2,
+ "has_batch_no": 1,
+ "has_serial_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "SAMPLE-RET-.#####",
+ "serial_no_series": "SAMPLE-RET-SN-.#####",
+ },
+ )
+ material_receipt = make_stock_entry(
+ item_code=retain_sample_item.item_code, target=warehouse, qty=10, purpose="Material Receipt"
+ )
+
+ source_sabb = frappe.get_doc(
+ "Serial and Batch Bundle", material_receipt.items[0].serial_and_batch_bundle
+ )
+ batch = source_sabb.entries[0].batch_no
+ serial_nos = [entry.serial_no for entry in source_sabb.entries]
+
+ sample_entry = frappe.get_doc(
+ move_sample_to_retention_warehouse(material_receipt.company, material_receipt.items)
+ )
+ sample_entry.submit()
+ target_sabb = frappe.get_doc("Serial and Batch Bundle", sample_entry.items[0].serial_and_batch_bundle)
+
+ self.assertEqual(sample_entry.items[0].transfer_qty, 2)
+ self.assertEqual(target_sabb.entries[0].batch_no, batch)
+ self.assertEqual([entry.serial_no for entry in target_sabb.entries], serial_nos[:2])
+
def make_serialized_item(self, **args):
args = frappe._dict(args)
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index 87e070b0b05..4f6919e145b 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -232,7 +232,7 @@ class StockLedgerEntry(Document):
)
if item_detail.is_stock_item != 1:
- self.throw_error_message("Item {0} must be a stock Item").format(self.item_code)
+ self.throw_error_message(f"Item {self.item_code} must be a stock Item")
if item_detail.has_serial_no or item_detail.has_batch_no:
if not self.serial_and_batch_bundle:
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index fa3cada5731..59683e87e3d 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -4,7 +4,7 @@
import frappe
from frappe import _, bold, json, msgprint
-from frappe.query_builder.functions import CombineDatetime, Sum
+from frappe.query_builder.functions import Sum
from frappe.utils import add_to_date, cint, cstr, flt, get_datetime, now
import erpnext
diff --git a/erpnext/stock/report/stock_analytics/stock_analytics.py b/erpnext/stock/report/stock_analytics/stock_analytics.py
index 16dea3c2942..36f0f2e5be6 100644
--- a/erpnext/stock/report/stock_analytics/stock_analytics.py
+++ b/erpnext/stock/report/stock_analytics/stock_analytics.py
@@ -4,7 +4,6 @@ import datetime
import frappe
from frappe import _, scrub
-from frappe.query_builder.functions import CombineDatetime
from frappe.utils import get_datetime, get_first_day_of_week, get_quarter_start, getdate
from frappe.utils import get_first_day as get_first_day_of_month
from frappe.utils.nestedset import get_descendants_of
diff --git a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
index 172e0fa6a41..8afe1d72e27 100644
--- a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
+++ b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
@@ -42,9 +42,37 @@ def get_data(report_filters):
gl_data = voucher_wise_gl_data.get(key) or {}
d.account_value = gl_data.get("account_value", 0)
d.difference_value = d.stock_value - d.account_value
+ d.ledger_type = "Stock Ledger Entry"
if abs(d.difference_value) > 0.1:
data.append(d)
+ if key in voucher_wise_gl_data:
+ del voucher_wise_gl_data[key]
+
+ if voucher_wise_gl_data:
+ data += get_gl_ledgers_with_no_stock_ledger_entries(voucher_wise_gl_data)
+
+ return data
+
+
+def get_gl_ledgers_with_no_stock_ledger_entries(voucher_wise_gl_data):
+ data = []
+
+ for key in voucher_wise_gl_data:
+ gl_data = voucher_wise_gl_data.get(key) or {}
+ data.append(
+ {
+ "name": gl_data.get("name"),
+ "ledger_type": "GL Entry",
+ "voucher_type": gl_data.get("voucher_type"),
+ "voucher_no": gl_data.get("voucher_no"),
+ "posting_date": gl_data.get("posting_date"),
+ "stock_value": 0,
+ "account_value": gl_data.get("account_value", 0),
+ "difference_value": gl_data.get("account_value", 0) * -1,
+ }
+ )
+
return data
@@ -88,6 +116,7 @@ def get_gl_data(report_filters, filters):
"name",
"voucher_type",
"voucher_no",
+ "posting_date",
{
"SUB": [{"SUM": "debit_in_account_currency"}, {"SUM": "credit_in_account_currency"}],
"as": "account_value",
@@ -109,10 +138,15 @@ def get_columns(filters):
{
"label": _("Stock Ledger ID"),
"fieldname": "name",
- "fieldtype": "Link",
- "options": "Stock Ledger Entry",
+ "fieldtype": "Dynamic Link",
+ "options": "ledger_type",
"width": "80",
},
+ {
+ "label": _("Ledger Type"),
+ "fieldname": "ledger_type",
+ "fieldtype": "Data",
+ },
{"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date"},
{"label": _("Posting Time"), "fieldname": "posting_time", "fieldtype": "Time"},
{"label": _("Voucher Type"), "fieldname": "voucher_type", "width": "110"},
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index b55a8e43f67..8e37799e8ce 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -7,7 +7,7 @@ from collections import defaultdict
import frappe
from frappe import _
-from frappe.query_builder.functions import CombineDatetime, Sum
+from frappe.query_builder.functions import Sum
from frappe.utils import cint, flt, get_datetime
from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions
diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py
index 298cec2fa89..50603eb609d 100644
--- a/erpnext/stock/serial_batch_bundle.py
+++ b/erpnext/stock/serial_batch_bundle.py
@@ -4,7 +4,7 @@ import frappe
from frappe import _, bold
from frappe.model.naming import NamingSeries, make_autoname, parse_naming_series
from frappe.query_builder import Case
-from frappe.query_builder.functions import CombineDatetime, Sum, Timestamp
+from frappe.query_builder.functions import Max, Sum, Timestamp
from frappe.utils import add_days, cint, cstr, flt, get_link_to_form, getdate, now, nowtime, today
from pypika import Order
from pypika.terms import ExistsCriterion
@@ -324,6 +324,12 @@ class SerialBatchBundle:
{"is_cancelled": 1},
)
+ frappe.db.set_value(
+ "Serial and Batch Entry",
+ {"voucher_no": self.sle.voucher_no, "voucher_type": self.sle.voucher_type},
+ {"is_cancelled": 1},
+ )
+
if self.sle.serial_and_batch_bundle:
frappe.get_cached_doc(
"Serial and Batch Bundle", self.sle.serial_and_batch_bundle
@@ -629,8 +635,9 @@ class SerialNoValuation(DeprecatedSerialNoValuation):
self.old_serial_nos = []
serial_nos = self.get_serial_nos()
+ result = self.get_serial_no_wise_incoming_rate(serial_nos)
for serial_no in serial_nos:
- incoming_rate = self.get_incoming_rate_from_bundle(serial_no)
+ incoming_rate = result.get(serial_no)
if incoming_rate is None:
self.old_serial_nos.append(serial_no)
continue
@@ -640,39 +647,88 @@ class SerialNoValuation(DeprecatedSerialNoValuation):
self.calculate_stock_value_from_deprecarated_ledgers()
- def get_incoming_rate_from_bundle(self, serial_no) -> float:
- bundle = frappe.qb.DocType("Serial and Batch Bundle")
+ def get_serial_no_wise_incoming_rate(self, serial_nos):
bundle_child = frappe.qb.DocType("Serial and Batch Entry")
- query = (
- frappe.qb.from_(bundle)
- .inner_join(bundle_child)
- .on(bundle.name == bundle_child.parent)
- .select((bundle_child.incoming_rate * bundle_child.qty).as_("incoming_rate"))
- .where(
- (bundle.is_cancelled == 0)
- & (bundle.docstatus == 1)
- & (bundle_child.serial_no == serial_no)
- & (bundle.type_of_transaction == "Inward")
- & (bundle_child.qty > 0)
- & (bundle.item_code == self.sle.item_code)
- & (bundle_child.warehouse == self.sle.warehouse)
+ def get_latest_based_on_posting_datetime():
+ # Get latest inward record based on posting datetime for each serial no
+
+ latest_posting = (
+ frappe.qb.from_(bundle_child)
+ .select(
+ bundle_child.serial_no,
+ Max(bundle_child.posting_datetime).as_("max_posting_dt"),
+ )
+ .where(
+ (bundle_child.is_cancelled == 0)
+ & (bundle_child.docstatus == 1)
+ & (bundle_child.type_of_transaction == "Inward")
+ & (bundle_child.qty > 0)
+ & (bundle_child.item_code == self.sle.item_code)
+ & (bundle_child.warehouse == self.sle.warehouse)
+ & (bundle_child.serial_no.isin(serial_nos))
+ )
+ .groupby(bundle_child.serial_no)
+ )
+
+ # Important to exclude the current voucher to calculate correct the stock value difference
+ if self.sle.voucher_no:
+ latest_posting = latest_posting.where(bundle_child.voucher_no != self.sle.voucher_no)
+
+ if self.sle.posting_datetime:
+ timestamp_condition = bundle_child.posting_datetime <= self.sle.posting_datetime
+
+ latest_posting = latest_posting.where(timestamp_condition)
+
+ latest_posting = latest_posting.as_("latest_posting")
+
+ return latest_posting
+
+ def get_latest_based_on_creation(latest_posting):
+ # Get latest inward record based on creation for each serial no
+ latest_creation = (
+ frappe.qb.from_(bundle_child)
+ .join(latest_posting)
+ .on(
+ (latest_posting.serial_no == bundle_child.serial_no)
+ & (latest_posting.max_posting_dt == bundle_child.posting_datetime)
+ )
+ .select(
+ bundle_child.serial_no,
+ Max(bundle_child.creation).as_("max_creation"),
+ )
+ .where(
+ (bundle_child.is_cancelled == 0)
+ & (bundle_child.docstatus == 1)
+ & (bundle_child.type_of_transaction == "Inward")
+ & (bundle_child.qty > 0)
+ & (bundle_child.item_code == self.sle.item_code)
+ & (bundle_child.warehouse == self.sle.warehouse)
+ )
+ .groupby(bundle_child.serial_no)
+ ).as_("latest_creation")
+
+ return latest_creation
+
+ latest_posting = get_latest_based_on_posting_datetime()
+ latest_creation = get_latest_based_on_creation(latest_posting)
+
+ query = (
+ frappe.qb.from_(bundle_child)
+ .join(latest_creation)
+ .on(
+ (latest_creation.serial_no == bundle_child.serial_no)
+ & (latest_creation.max_creation == bundle_child.creation)
+ )
+ .select(
+ bundle_child.serial_no,
+ bundle_child.incoming_rate,
)
- .orderby(bundle.posting_datetime, order=Order.desc)
- .limit(1)
)
- # Important to exclude the current voucher to calculate correct the stock value difference
- if self.sle.voucher_no:
- query = query.where(bundle.voucher_no != self.sle.voucher_no)
+ result = query.run(as_list=1)
- if self.sle.posting_datetime:
- timestamp_condition = bundle.posting_datetime <= self.sle.posting_datetime
-
- query = query.where(timestamp_condition)
-
- incoming_rate = query.run()
- return flt(incoming_rate[0][0]) if incoming_rate else None
+ return frappe._dict(result) if result else frappe._dict({})
def get_serial_nos(self):
if self.sle.get("serial_nos"):
@@ -784,7 +840,8 @@ class BatchNoValuation(DeprecatedBatchNoValuation):
Sum(child.qty).as_("total_qty"),
)
.where(
- (child.warehouse == self.sle.warehouse)
+ (child.item_code == self.sle.item_code)
+ & (child.warehouse == self.sle.warehouse)
& (child.batch_no.isin(self.batchwise_valuation_batches))
& (child.docstatus == 1)
& (child.type_of_transaction.isin(["Inward", "Outward"]))
@@ -830,7 +887,8 @@ class BatchNoValuation(DeprecatedBatchNoValuation):
Sum(child.qty).as_("qty"),
)
.where(
- (child.warehouse == self.sle.warehouse)
+ (child.item_code == self.sle.item_code)
+ & (child.warehouse == self.sle.warehouse)
& (child.batch_no.isin(self.batchwise_valuation_batches))
& (child.docstatus == 1)
& (child.type_of_transaction.isin(["Inward", "Outward"]))
@@ -931,9 +989,10 @@ def get_batch_nos(serial_and_batch_bundle):
entries = frappe.get_all(
"Serial and Batch Entry",
- fields=["batch_no", "qty", "name"],
+ fields=["batch_no", {"SUM": "qty", "as": "qty"}],
filters={"parent": serial_and_batch_bundle, "batch_no": ("is", "set")},
order_by="idx",
+ group_by="batch_no",
)
if not entries:
@@ -1058,7 +1117,7 @@ class SerialBatchCreation:
id = self.serial_and_batch_bundle
package = frappe.get_doc("Serial and Batch Bundle", id)
- new_package = frappe.copy_doc(package)
+ new_package = frappe.copy_doc(package, ignore_no_copy=False)
if self.get("returned_serial_nos"):
self.remove_returned_serial_nos(new_package)
@@ -1135,6 +1194,9 @@ class SerialBatchCreation:
doc.submit()
else:
+ if self.get("ignore_sabb_validation"):
+ doc.flags.ignore_validate = True
+
doc.save()
self.validate_qty(doc)
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 10b319325ae..7a9a2ad273a 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -1903,31 +1903,6 @@ def get_sle_by_voucher_detail_no(voucher_detail_no, excluded_sle=None):
)
-def get_batch_incoming_rate(item_code, warehouse, batch_no, posting_date, posting_time, creation=None):
- sle = frappe.qb.DocType("Stock Ledger Entry")
-
- timestamp_condition = sle.posting_datetime < get_combine_datetime(posting_date, posting_time)
- if creation:
- timestamp_condition |= (sle.posting_datetime == get_combine_datetime(posting_date, posting_time)) & (
- sle.creation < creation
- )
-
- batch_details = (
- frappe.qb.from_(sle)
- .select(Sum(sle.stock_value_difference).as_("batch_value"), Sum(sle.actual_qty).as_("batch_qty"))
- .where(
- (sle.item_code == item_code)
- & (sle.warehouse == warehouse)
- & (sle.batch_no == batch_no)
- & (sle.is_cancelled == 0)
- )
- .where(timestamp_condition)
- ).run(as_dict=True)
-
- if batch_details and batch_details[0].batch_qty:
- return batch_details[0].batch_value / batch_details[0].batch_qty
-
-
def get_valuation_rate(
item_code,
warehouse,
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 5367d67004c..7a60dcb64fc 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -6,7 +6,7 @@ import json
import frappe
from frappe import _
-from frappe.query_builder.functions import CombineDatetime, IfNull, Sum
+from frappe.query_builder.functions import IfNull, Sum
from frappe.utils import cstr, flt, get_link_to_form, get_time, getdate, nowdate, nowtime
import erpnext
@@ -331,34 +331,6 @@ def get_incoming_rate(args, raise_error_if_no_rate=True):
return flt(in_rate)
-def get_batch_incoming_rate(item_code, warehouse, batch_no, posting_date, posting_time, creation=None):
- sle = frappe.qb.DocType("Stock Ledger Entry")
-
- timestamp_condition = CombineDatetime(sle.posting_date, sle.posting_time) < CombineDatetime(
- posting_date, posting_time
- )
- if creation:
- timestamp_condition |= (
- CombineDatetime(sle.posting_date, sle.posting_time) == CombineDatetime(posting_date, posting_time)
- ) & (sle.creation < creation)
-
- batch_details = (
- frappe.qb.from_(sle)
- .select(Sum(sle.stock_value_difference).as_("batch_value"), Sum(sle.actual_qty).as_("batch_qty"))
- .where(
- (sle.item_code == item_code)
- & (sle.warehouse == warehouse)
- & (sle.batch_no == batch_no)
- & (sle.serial_and_batch_bundle.isnull())
- & (sle.is_cancelled == 0)
- )
- .where(timestamp_condition)
- ).run(as_dict=True)
-
- if batch_details and batch_details[0].batch_qty:
- return batch_details[0].batch_value / batch_details[0].batch_qty
-
-
def get_avg_purchase_rate(serial_nos):
"""get average value of serial numbers"""
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 0f29de81ebd..375c2a4409a 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -295,6 +295,9 @@ class TransactionBase(StatusUpdater):
# Server side 'item' doc. Update this to reflect in UI
item_obj = self.get("items", {"idx": item_idx})[0]
+ if not item_obj.item_code:
+ return
+
# 'item_details' has latest item related values
item_details = self.fetch_item_details(item_obj)
diff --git a/erpnext/workspace_sidebar/accounting.json b/erpnext/workspace_sidebar/accounting.json
index e40f17b546f..0246a1f31b2 100644
--- a/erpnext/workspace_sidebar/accounting.json
+++ b/erpnext/workspace_sidebar/accounting.json
@@ -67,7 +67,7 @@
{
"child": 1,
"collapsible": 1,
- "filters": "",
+ "filters": "[[\"Sales Invoice\",\"is_return\",\"=\",1]]",
"icon": "",
"indent": 0,
"keep_closed": 0,
@@ -126,6 +126,7 @@
{
"child": 1,
"collapsible": 1,
+ "filters": "[[\"Purchase Invoice\",\"is_return\",\"=\",1]]",
"indent": 0,
"keep_closed": 0,
"label": "Debit Note",
@@ -570,10 +571,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 18:07:04.450536",
+ "modified": "2026-01-10 00:06:13.234927",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounting",
"owner": "Administrator",
+ "standard": 1,
"title": "Accounting"
}
diff --git a/erpnext/workspace_sidebar/assets.json b/erpnext/workspace_sidebar/assets.json
index 6f6e709c8f6..5f54ce2bd35 100644
--- a/erpnext/workspace_sidebar/assets.json
+++ b/erpnext/workspace_sidebar/assets.json
@@ -258,10 +258,11 @@
"url": ""
}
],
- "modified": "2026-01-02 14:54:20.640887",
+ "modified": "2026-01-10 00:06:13.218453",
"modified_by": "Administrator",
"module": "Assets",
"name": "Assets",
"owner": "Administrator",
+ "standard": 1,
"title": "Assets"
}
diff --git a/erpnext/workspace_sidebar/banking.json b/erpnext/workspace_sidebar/banking.json
index 95834113772..b73120cc4a7 100644
--- a/erpnext/workspace_sidebar/banking.json
+++ b/erpnext/workspace_sidebar/banking.json
@@ -6,18 +6,6 @@
"header_icon": "circle-dollar-sign",
"idx": 0,
"items": [
- {
- "child": 0,
- "collapsible": 1,
- "icon": "home",
- "indent": 0,
- "keep_closed": 0,
- "label": "Home",
- "link_to": "Banking",
- "link_type": "Workspace",
- "show_arrow": 0,
- "type": "Link"
- },
{
"child": 0,
"collapsible": 1,
@@ -192,10 +180,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 13:53:50.930215",
+ "modified": "2026-01-10 00:06:13.017457",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Banking",
"owner": "Administrator",
+ "standard": 1,
"title": "Banking"
}
diff --git a/erpnext/workspace_sidebar/budget.json b/erpnext/workspace_sidebar/budget.json
index 94ebfc9c994..dd9b6f87311 100644
--- a/erpnext/workspace_sidebar/budget.json
+++ b/erpnext/workspace_sidebar/budget.json
@@ -67,10 +67,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 11:46:10.598472",
+ "modified": "2026-01-10 00:06:13.032297",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Budget",
"owner": "Administrator",
+ "standard": 1,
"title": "Budget"
}
diff --git a/erpnext/workspace_sidebar/buying.json b/erpnext/workspace_sidebar/buying.json
index ecf87ecc68f..ec7f6a3ccd4 100644
--- a/erpnext/workspace_sidebar/buying.json
+++ b/erpnext/workspace_sidebar/buying.json
@@ -369,10 +369,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 12:10:07.304778",
+ "modified": "2026-01-10 00:06:12.979668",
"modified_by": "Administrator",
"module": "Buying",
"name": "Buying",
"owner": "Administrator",
+ "standard": 1,
"title": "Buying"
}
diff --git a/erpnext/workspace_sidebar/crm.json b/erpnext/workspace_sidebar/crm.json
index 264318c1c8d..6e8bde422f2 100644
--- a/erpnext/workspace_sidebar/crm.json
+++ b/erpnext/workspace_sidebar/crm.json
@@ -485,10 +485,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 15:06:29.836236",
+ "modified": "2026-01-10 00:06:13.192366",
"modified_by": "Administrator",
"module": "CRM",
"name": "CRM",
"owner": "Administrator",
+ "standard": 1,
"title": "CRM"
}
diff --git a/erpnext/workspace_sidebar/settings.json b/erpnext/workspace_sidebar/erpnext_settings.json
similarity index 97%
rename from erpnext/workspace_sidebar/settings.json
rename to erpnext/workspace_sidebar/erpnext_settings.json
index 6414b0f21f8..117a36b666e 100644
--- a/erpnext/workspace_sidebar/settings.json
+++ b/erpnext/workspace_sidebar/erpnext_settings.json
@@ -227,10 +227,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 18:04:13.860117",
+ "modified": "2026-01-10 00:06:12.956275",
"modified_by": "Administrator",
"module": "Setup",
- "name": "Settings",
+ "name": "ERPNext Settings",
"owner": "Administrator",
- "title": "Settings"
+ "standard": 1,
+ "title": "ERPNext Settings"
}
diff --git a/erpnext/workspace_sidebar/financial_reports.json b/erpnext/workspace_sidebar/financial_reports.json
index 85363d9e6d3..52cfb4fd9ec 100644
--- a/erpnext/workspace_sidebar/financial_reports.json
+++ b/erpnext/workspace_sidebar/financial_reports.json
@@ -72,6 +72,17 @@
"show_arrow": 0,
"type": "Link"
},
+ {
+ "child": 1,
+ "collapsible": 1,
+ "indent": 0,
+ "keep_closed": 0,
+ "label": "Custom Financial Statement",
+ "link_to": "Custom Financial Statement",
+ "link_type": "Report",
+ "show_arrow": 0,
+ "type": "Link"
+ },
{
"child": 1,
"collapsible": 1,
@@ -128,6 +139,104 @@
"show_arrow": 0,
"type": "Link"
},
+ {
+ "child": 0,
+ "collapsible": 1,
+ "indent": 1,
+ "keep_closed": 1,
+ "label": "Registers",
+ "link_type": "DocType",
+ "show_arrow": 0,
+ "type": "Section Break"
+ },
+ {
+ "child": 1,
+ "collapsible": 1,
+ "indent": 0,
+ "keep_closed": 0,
+ "label": "Accounts Receivable",
+ "link_to": "Accounts Receivable",
+ "link_type": "Report",
+ "show_arrow": 0,
+ "type": "Link"
+ },
+ {
+ "child": 1,
+ "collapsible": 1,
+ "indent": 0,
+ "keep_closed": 0,
+ "label": "Accounts Payable",
+ "link_to": "Accounts Payable",
+ "link_type": "Report",
+ "show_arrow": 0,
+ "type": "Link"
+ },
+ {
+ "child": 1,
+ "collapsible": 1,
+ "indent": 0,
+ "keep_closed": 0,
+ "label": "AR Summary",
+ "link_to": "Accounts Receivable Summary",
+ "link_type": "Report",
+ "show_arrow": 0,
+ "type": "Link"
+ },
+ {
+ "child": 1,
+ "collapsible": 1,
+ "indent": 0,
+ "keep_closed": 0,
+ "label": "AP Summary",
+ "link_to": "Accounts Payable Summary",
+ "link_type": "Report",
+ "show_arrow": 0,
+ "type": "Link"
+ },
+ {
+ "child": 1,
+ "collapsible": 1,
+ "indent": 0,
+ "keep_closed": 0,
+ "label": "Sales Register",
+ "link_to": "Sales Register",
+ "link_type": "Report",
+ "show_arrow": 0,
+ "type": "Link"
+ },
+ {
+ "child": 1,
+ "collapsible": 1,
+ "indent": 0,
+ "keep_closed": 0,
+ "label": "Purchase Register",
+ "link_to": "Purchase Register",
+ "link_type": "Report",
+ "show_arrow": 0,
+ "type": "Link"
+ },
+ {
+ "child": 1,
+ "collapsible": 1,
+ "indent": 0,
+ "keep_closed": 0,
+ "label": "Item-wise sales Register",
+ "link_to": "Item-wise Sales Register",
+ "link_type": "Report",
+ "show_arrow": 0,
+ "type": "Link"
+ },
+ {
+ "child": 1,
+ "collapsible": 1,
+ "indent": 0,
+ "keep_closed": 0,
+ "label": "Item-wise Purchase Register",
+ "link_to": "Item-wise Purchase Register",
+ "link_type": "Report",
+ "show_arrow": 0,
+ "type": "Link"
+ },
{
"child": 0,
"collapsible": 1,
@@ -272,10 +381,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 14:44:46.627363",
+ "modified": "2026-01-10 00:06:13.168391",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Financial Reports",
"owner": "Administrator",
+ "standard": 1,
"title": "Financial Reports"
}
diff --git a/erpnext/workspace_sidebar/home.json b/erpnext/workspace_sidebar/home.json
index 61b3e600421..82e1b8d7605 100644
--- a/erpnext/workspace_sidebar/home.json
+++ b/erpnext/workspace_sidebar/home.json
@@ -62,10 +62,11 @@
"type": "Link"
}
],
- "modified": "2025-11-25 10:46:09.198568",
+ "modified": "2026-01-10 00:06:12.971358",
"modified_by": "Administrator",
"module": "Setup",
"name": "Home",
"owner": "Administrator",
+ "standard": 1,
"title": "Home"
}
diff --git a/erpnext/workspace_sidebar/manufacturing.json b/erpnext/workspace_sidebar/manufacturing.json
index 08b6a054660..3c2a4a3dd9d 100644
--- a/erpnext/workspace_sidebar/manufacturing.json
+++ b/erpnext/workspace_sidebar/manufacturing.json
@@ -425,10 +425,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 15:08:30.661411",
+ "modified": "2026-01-10 00:06:13.058137",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Manufacturing",
"owner": "Administrator",
+ "standard": 1,
"title": "Manufacturing"
}
diff --git a/erpnext/workspace_sidebar/projects.json b/erpnext/workspace_sidebar/projects.json
index 58fec69ff3d..ec0960aa32a 100644
--- a/erpnext/workspace_sidebar/projects.json
+++ b/erpnext/workspace_sidebar/projects.json
@@ -223,10 +223,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 11:57:04.237376",
+ "modified": "2026-01-10 00:06:13.151947",
"modified_by": "Administrator",
"module": "Projects",
"name": "Projects",
"owner": "Administrator",
+ "standard": 1,
"title": "Projects"
}
diff --git a/erpnext/workspace_sidebar/quality.json b/erpnext/workspace_sidebar/quality.json
index 5dc41335404..0e9d20d2a91 100644
--- a/erpnext/workspace_sidebar/quality.json
+++ b/erpnext/workspace_sidebar/quality.json
@@ -124,17 +124,6 @@
"show_arrow": 0,
"type": "Link"
},
- {
- "child": 1,
- "collapsible": 1,
- "indent": 0,
- "keep_closed": 0,
- "label": "Tree of Procedures",
- "link_to": "Quality Procedure",
- "link_type": "DocType",
- "show_arrow": 0,
- "type": "Link"
- },
{
"child": 1,
"collapsible": 1,
@@ -158,10 +147,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 17:39:50.641254",
+ "modified": "2026-01-12 12:59:09.607272",
"modified_by": "Administrator",
"module": "Quality Management",
"name": "Quality",
"owner": "Administrator",
+ "standard": 1,
"title": "Quality"
}
diff --git a/erpnext/workspace_sidebar/selling.json b/erpnext/workspace_sidebar/selling.json
index 766b8f87fa9..3ac2dc8665c 100644
--- a/erpnext/workspace_sidebar/selling.json
+++ b/erpnext/workspace_sidebar/selling.json
@@ -687,10 +687,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 17:44:08.721891",
+ "modified": "2026-01-10 00:06:13.103140",
"modified_by": "Administrator",
"module": "Selling",
"name": "Selling",
"owner": "Administrator",
+ "standard": 1,
"title": "Selling"
}
diff --git a/erpnext/workspace_sidebar/share_management.json b/erpnext/workspace_sidebar/share_management.json
index 1b49348e477..20eb476bfb7 100644
--- a/erpnext/workspace_sidebar/share_management.json
+++ b/erpnext/workspace_sidebar/share_management.json
@@ -55,10 +55,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 14:53:29.842384",
+ "modified": "2026-01-10 00:06:13.040767",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Share Management",
"owner": "Administrator",
+ "standard": 1,
"title": "Share Management"
}
diff --git a/erpnext/workspace_sidebar/stock.json b/erpnext/workspace_sidebar/stock.json
index 87c53dad060..14c5faa24e8 100644
--- a/erpnext/workspace_sidebar/stock.json
+++ b/erpnext/workspace_sidebar/stock.json
@@ -625,10 +625,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 18:10:31.153427",
+ "modified": "2026-01-10 00:06:12.912403",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock",
"owner": "Administrator",
+ "standard": 1,
"title": "Stock"
}
diff --git a/erpnext/workspace_sidebar/subcontracting.json b/erpnext/workspace_sidebar/subcontracting.json
index f555875c292..31618a4a860 100644
--- a/erpnext/workspace_sidebar/subcontracting.json
+++ b/erpnext/workspace_sidebar/subcontracting.json
@@ -192,14 +192,16 @@
"label": "Settings",
"link_to": "Buying Settings",
"link_type": "DocType",
+ "navigate_to_tab": "subcontract",
"show_arrow": 0,
"type": "Link"
}
],
- "modified": "2026-01-02 17:51:15.843931",
+ "modified": "2026-01-12 13:12:47.927785",
"modified_by": "Administrator",
"module": "Buying",
"name": "Subcontracting",
"owner": "Administrator",
+ "standard": 1,
"title": "Subcontracting"
}
diff --git a/erpnext/workspace_sidebar/subscription.json b/erpnext/workspace_sidebar/subscription.json
index ed91cc0c04c..ca42736b27c 100644
--- a/erpnext/workspace_sidebar/subscription.json
+++ b/erpnext/workspace_sidebar/subscription.json
@@ -87,10 +87,11 @@
"type": "Link"
}
],
- "modified": "2025-12-22 17:06:54.262451",
+ "modified": "2026-01-10 00:06:13.048591",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Subscription",
"owner": "Administrator",
+ "standard": 1,
"title": "Subscription"
}
diff --git a/erpnext/workspace_sidebar/support.json b/erpnext/workspace_sidebar/support.json
index b62a52554f3..364c0071ebd 100644
--- a/erpnext/workspace_sidebar/support.json
+++ b/erpnext/workspace_sidebar/support.json
@@ -145,10 +145,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 17:47:19.864824",
+ "modified": "2026-01-10 00:06:13.089991",
"modified_by": "Administrator",
"module": "Support",
"name": "Support",
"owner": "Administrator",
+ "standard": 1,
"title": "Support"
}
diff --git a/erpnext/workspace_sidebar/taxes.json b/erpnext/workspace_sidebar/taxes.json
index 9d9033f29ac..5cf65ff3c67 100644
--- a/erpnext/workspace_sidebar/taxes.json
+++ b/erpnext/workspace_sidebar/taxes.json
@@ -148,10 +148,11 @@
"type": "Link"
}
],
- "modified": "2026-01-02 14:40:04.075046",
+ "modified": "2026-01-10 00:06:13.005238",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Taxes",
"owner": "Administrator",
+ "standard": 1,
"title": "Taxes"
}
diff --git a/pyproject.toml b/pyproject.toml
index e450d675f02..c4029137907 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,7 +38,7 @@ skip_namespaces = [
]
[tool.bench.frappe-dependencies]
-frappe = ">=16.0.0-dev,<17.0.0"
+frappe = ">=17.0.0-dev,<18.0.0"
[tool.ruff]
line-length = 110