mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-01 12:38:27 +00:00
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 1fbde7b8c6)
# Conflicts:
# erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
This commit is contained in:
@@ -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
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user