From b7d49478e8e6ad429040fe7b7a20c2897e492f96 Mon Sep 17 00:00:00 2001
From: Anwar Patel <140244767+anwarpatelnoori@users.noreply.github.com>
Date: Thu, 28 Aug 2025 23:36:38 +0530
Subject: [PATCH] Merge pull request #49289 from anwarpatelnoori/stage

fix: Company currency label is not displayed in Landed Cost Voucher doctype for the field Total Vendor Invoices Cost
(cherry picked from commit 1fbde7b8c686abf0ea7d0dd2d13b2ade59d0d0b6)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
---
 .../landed_cost_voucher.js                    |  5 ++++-
 .../landed_cost_voucher.json                  | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
index 0ecb9f2600e..54e61c353d5 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
@@ -66,7 +66,10 @@ erpnext.stock.LandedCostVoucher = class LandedCostVoucher extends erpnext.stock.
 
 		if (this.frm.doc.company) {
 			let company_currency = frappe.get_doc(":Company", this.frm.doc.company).default_currency;
-			this.frm.set_currency_labels(["total_taxes_and_charges"], company_currency);
+			this.frm.set_currency_labels(
+				["total_taxes_and_charges", "total_vendor_invoices_cost"],
+				company_currency
+			);
 		}
 	}
 
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
index 059f925184b..1865e0fc035 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
@@ -172,9 +172,28 @@
   {
    "fieldname": "section_break_5",
    "fieldtype": "Section Break",
+<<<<<<< HEAD
    "hide_border": 1,
    "show_days": 1,
    "show_seconds": 1
+=======
+   "hide_border": 1
+  },
+  {
+   "fieldname": "vendor_invoices",
+   "fieldtype": "Table",
+   "label": "Vendor Invoices",
+   "options": "Landed Cost Vendor Invoice"
+  },
+  {
+   "fieldname": "total_vendor_invoices_cost",
+   "fieldtype": "Currency",
+   "label": "Total Vendor Invoices Cost (Company Currency)",
+   "options": "Company:company:default_currency",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+>>>>>>> 1fbde7b8c6 (Merge pull request #49289 from anwarpatelnoori/stage)
   }
  ],
  "icon": "icon-usd",