Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39936 from barredterra/label-context

Browse Source
This commit is contained in:
Raffael Meyer 2024-02-29 15:09:49 +01:00 committed by GitHub
commit b235f48067
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html
View File

@ -5,7 +5,7 @@
<div class="row {% if df.bold %}important{% endif %} data-field"> <div class="row {% if df.bold %}important{% endif %} data-field">
<div class="col-xs-{{ "9" if df.fieldtype=="Check" else "5" }} <div class="col-xs-{{ "9" if df.fieldtype=="Check" else "5" }}
{%- if doc.align_labels_right %} text-right{%- endif -%}"> {%- if doc.align_labels_right %} text-right{%- endif -%}">
<label>{{ _(df.label) }}</label> <label>{{ _(df.label, context=df.parent) }}</label>
</div> </div>
<div class="col-xs-{{ "3" if df.fieldtype=="Check" else "7" }} value"> <div class="col-xs-{{ "3" if df.fieldtype=="Check" else "7" }} value">
{% if doc.get(df.fieldname) != None -%} {% if doc.get(df.fieldname) != None -%}

2
erpnext/stock/doctype/item_variant_settings/item_variant_settings.js
View File

@ -15,7 +15,7 @@ frappe.ui.form.on('Item Variant Settings', {
frappe.model.with_doctype('Item', () => { frappe.model.with_doctype('Item', () => {
const field_label_map = {}; const field_label_map = {};
frappe.get_meta('Item').fields.forEach(d => { 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) if (!in_list(exclude_field_types, d.fieldtype)
&& !d.no_copy && !in_list(exclude_fields, d.fieldname)) { && !d.no_copy && !in_list(exclude_fields, d.fieldname)) {

2
erpnext/templates/form_grid/includes/visible_cols.html
View File

@ -3,7 +3,7 @@
if((df.fieldname !== "description" && df.fieldname !== "item_name") && val) { %} if((df.fieldname !== "description" && df.fieldname !== "item_name") && val) { %}
<div class="row"> <div class="row">
<div class="col-xs-4 ellipsis"> <div class="col-xs-4 ellipsis">
<strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong> <strong title="{%= __(df.label, null, df.parent) %}">{%= __(df.label, null, df.parent) %}:</strong>
</div> </div>
<div class="col-xs-8"> <div class="col-xs-8">
{%= doc.get_formatted(df.fieldname) %} {%= doc.get_formatted(df.fieldname) %}

2
erpnext/templates/print_formats/includes/total.html
View File

@ -7,7 +7,7 @@
</div> </div>
{% else %} {% else %}
<div class="col-xs-5 {%- if doc.align_labels_right %} text-right{%- endif -%}"> <div class="col-xs-5 {%- if doc.align_labels_right %} text-right{%- endif -%}">
<label>{{ _(df.label) }}</label></div> <label>{{ _(df.label, context=df.parent) }}</label></div>
<div class="col-xs-7 text-right"> <div class="col-xs-7 text-right">
{{ doc.get_formatted("total", doc) }} {{ doc.get_formatted("total", doc) }}
</div> </div>