From 2d42904bfb9c98ef43d776412c7eab48a46dec51 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 16 Dec 2025 18:24:39 +0100 Subject: [PATCH] fix: use serial and batch bundle to fetch incoming rate (backport #51119) (#51146) Co-authored-by: NaviN <118178330+Navin-S-R@users.noreply.github.com> Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> fix: use serial and batch bundle to fetch incoming rate (#51119) --- .../doctype/asset_capitalization/asset_capitalization.js | 8 ++++++++ .../doctype/asset_capitalization/asset_capitalization.py | 2 ++ 2 files changed, 10 insertions(+) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js index 5d47cc13e5b..98cbe10693f 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js @@ -197,6 +197,13 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s } } + serial_and_batch_bundle(doc, cdt, cdn) { + var row = frappe.get_doc(cdt, cdn); + if (cdt === "Asset Capitalization Stock Item") { + this.get_warehouse_details(row); + } + } + asset(doc, cdt, cdn) { var row = frappe.get_doc(cdt, cdn); if (cdt === "Asset Capitalization Asset Item") { @@ -410,6 +417,7 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s voucher_type: me.frm.doc.doctype, voucher_no: me.frm.doc.name, allow_zero_valuation: 1, + serial_and_batch_bundle: item.serial_and_batch_bundle, }, }, callback: function (r) { diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py index 4179ceccb59..1f671333cfa 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py @@ -363,6 +363,7 @@ class AssetCapitalization(StockController): "voucher_no": self.name, "company": self.company, "allow_zero_valuation": cint(item.get("allow_zero_valuation_rate")), + "serial_and_batch_bundle": item.serial_and_batch_bundle, } ) @@ -763,6 +764,7 @@ def get_consumed_stock_item_details(args): "company": args.company, "serial_no": args.serial_no, "batch_no": args.batch_no, + "serial_and_batch_bundle": args.serial_and_batch_bundle, } ) out.update(get_warehouse_details(incoming_rate_args))