diff --git a/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html b/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html index b474fdbe2fc35ad510df6d65463629eb77e4b360..22c44f09d7006b6f7a5a20201cb09be4db5b0898 100644 --- a/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html +++ b/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html @@ -5,7 +5,7 @@
- +
{% if doc.get(df.fieldname) != None -%} diff --git a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.js b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.js index 058783c4ae3454657667b9867e7a89597b0d7e06..457e48fdaf9a9523cbd89409d06a9073370ceb3c 100644 --- a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.js +++ b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.js @@ -15,7 +15,7 @@ frappe.ui.form.on('Item Variant Settings', { frappe.model.with_doctype('Item', () => { const field_label_map = {}; frappe.get_meta('Item').fields.forEach(d => { - field_label_map[d.fieldname] = __(d.label) + ` (${d.fieldname})`; + field_label_map[d.fieldname] = __(d.label, null, d.parent) + ` (${d.fieldname})`; if (!in_list(exclude_field_types, d.fieldtype) && !d.no_copy && !in_list(exclude_fields, d.fieldname)) { diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html index 3a0cc8d7239aa1d0f56877deabe0801ef7ad3944..8d79bcdf87951bf8c4ca39b2fa8f094e6153c970 100644 --- a/erpnext/templates/form_grid/includes/visible_cols.html +++ b/erpnext/templates/form_grid/includes/visible_cols.html @@ -3,7 +3,7 @@ if((df.fieldname !== "description" && df.fieldname !== "item_name") && val) { %}
- {%= __(df.label) %}: + {%= __(df.label, null, df.parent) %}:
{%= doc.get_formatted(df.fieldname) %} diff --git a/erpnext/templates/print_formats/includes/total.html b/erpnext/templates/print_formats/includes/total.html index 209e8186b1b7b5982aef1b6807d87c2b0059bd31..1034ede4d27208c57d689f8fbd9ffcdd1a933940 100644 --- a/erpnext/templates/print_formats/includes/total.html +++ b/erpnext/templates/print_formats/includes/total.html @@ -7,7 +7,7 @@
{% else %}
-
+
{{ doc.get_formatted("total", doc) }}