+ ${__("Following documents are linked with {0}", [
+ frappe.utils
+ .get_form_link(this.frm.doctype, this.frm.docname, true)
+ .bold(),
+ ])}
- `;
- })
- .join("");
+ ${linked_doctypes
+ .map((doctype) => {
+ const { docs, hidden_count } = linked_docs[doctype];
+ let rows = (docs || [])
+ .map((doc) => this.make_doc_row(doc, doctype))
+ .join("");
+ if (hidden_count > 0) {
+ rows += this.make_hidden_count_row(hidden_count);
+ }
+ return `
+
+ ${this.make_doc_head(doctype)}
+ ${rows}
+
+ `;
+ })
+ .join("")}
+ `;
}
$(this.dialog.body).html(html);
@@ -68,6 +87,16 @@ frappe.ui.form.LinkedWith = class LinkedWith {
`;
}
+ make_hidden_count_row(count) {
+ return `
+
`;
+ }
+
make_doc_row(doc, doctype) {
return `
+
+
+ ${count == 1 ? __("{0} restricted document", [count]) : __("{0} restricted documents", [count])}
+
+
diff --git a/frappe/public/js/frappe/form/reminders.js b/frappe/public/js/frappe/form/reminders.js
index 5c8fa16060..667ca805d6 100644
--- a/frappe/public/js/frappe/form/reminders.js
+++ b/frappe/public/js/frappe/form/reminders.js
@@ -48,8 +48,7 @@ export class ReminderManager {
],
primary_action_label: __("Create"),
primary_action: () => {
- this.create_reminder();
- this.dialog.hide();
+ return this.create_reminder().then(() => this.dialog.hide());
},
secondary_action_label: __("Cancel"),
secondary_action: () => {
@@ -84,7 +83,7 @@ export class ReminderManager {
}
create_reminder() {
- frappe
+ return frappe
.xcall("frappe.automation.doctype.reminder.reminder.create_new_reminder", {
remind_at: this.dialog.get_value("remind_at"),
description: this.dialog.get_value("description"),
diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js
index e3c2cd1e4e..4a182d47e2 100644
--- a/frappe/public/js/frappe/form/save.js
+++ b/frappe/public/js/frappe/form/save.js
@@ -231,7 +231,7 @@ frappe.ui.form.check_mandatory = function (frm) {
}
function scroll_to(fieldname) {
- if (frm.scroll_to_field(fieldname)) {
+ if (frm.scroll_to_field(fieldname, false)) {
frm.scroll_set = true;
}
}
diff --git a/frappe/public/js/frappe/form/sidebar/assign_to.js b/frappe/public/js/frappe/form/sidebar/assign_to.js
index 6b867fdf51..4b487f2c08 100644
--- a/frappe/public/js/frappe/form/sidebar/assign_to.js
+++ b/frappe/public/js/frappe/form/sidebar/assign_to.js
@@ -114,9 +114,7 @@ frappe.ui.form.AssignToDialog = class AssignToDialog {
let args = me.dialog.get_values();
if (args && args.assign_to) {
- me.dialog.set_message("Assigning...");
-
- frappe.call({
+ return frappe.call({
method: me.method,
args: $.extend(args, {
doctype: me.doctype,
@@ -125,15 +123,12 @@ frappe.ui.form.AssignToDialog = class AssignToDialog {
bulk_assign: me.bulk_assign || false,
re_assign: me.re_assign || false,
}),
- btn: me.dialog.get_primary_btn(),
callback: function (r) {
if (!r.exc) {
if (me.callback) {
me.callback(r);
}
me.dialog && me.dialog.hide();
- } else {
- me.dialog.clear_message();
}
},
});
diff --git a/frappe/public/js/frappe/form/sidebar/attachments.js b/frappe/public/js/frappe/form/sidebar/attachments.js
index bb36a2f65b..894856dcec 100644
--- a/frappe/public/js/frappe/form/sidebar/attachments.js
+++ b/frappe/public/js/frappe/form/sidebar/attachments.js
@@ -180,8 +180,18 @@ frappe.ui.form.Attachments = class Attachments {
file_url = "/files/" + attachment.file_name;
}
}
+
+ const is_web_url = /^(https?:)?\/\//i.test(file_url);
+
+ file_url = encodeURI(file_url);
+
// hash is not escaped, https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURI
- return encodeURI(file_url).replace(/#/g, "%23");
+ // only encode hash if it's a local file path, not a web URL
+ if (!is_web_url) {
+ file_url = file_url.replace(/#/g, "%23");
+ }
+
+ return file_url;
}
get_file_id_from_file_url(file_url) {
var fid;
diff --git a/frappe/public/js/frappe/list/bulk_operations.js b/frappe/public/js/frappe/list/bulk_operations.js
index dd85c3da0d..0b794a03c3 100644
--- a/frappe/public/js/frappe/list/bulk_operations.js
+++ b/frappe/public/js/frappe/list/bulk_operations.js
@@ -452,9 +452,7 @@ export default class BulkOperations {
primary_action: () => {
let args = dialog.get_values();
if (args && args.tags) {
- dialog.set_message("Adding Tags...");
-
- frappe.call({
+ return frappe.call({
method: "frappe.desk.doctype.tag.tag.add_tags",
args: {
tags: args.tags,
diff --git a/frappe/public/js/frappe/list/list_filter.js b/frappe/public/js/frappe/list/list_filter.js
index e46c59eca9..f3ff15587b 100644
--- a/frappe/public/js/frappe/list/list_filter.js
+++ b/frappe/public/js/frappe/list/list_filter.js
@@ -120,7 +120,7 @@ export default class ListFilter {
fields: fields,
primary_action_label: __("Create"),
primary_action: (values) => {
- this.bind_save_filter(dialog, values.filter_name, values?.is_global);
+ return this.bind_save_filter(dialog, values.filter_name, values?.is_global);
},
});
dialog.show();
@@ -138,7 +138,7 @@ export default class ListFilter {
dialog.fields_dict.filter_name.set_description(__("Duplicate Filter Name"));
return;
}
- this.save_filter(value, is_global).then(() => {
+ return this.save_filter(value, is_global).then(() => {
this.refresh_list_filter();
dialog.hide();
});
diff --git a/frappe/public/js/frappe/model/meta.js b/frappe/public/js/frappe/model/meta.js
index d393f33cb7..7692dcfdfc 100644
--- a/frappe/public/js/frappe/model/meta.js
+++ b/frappe/public/js/frappe/model/meta.js
@@ -332,7 +332,8 @@ $.extend(frappe.meta, {
} else if (df && df.fieldtype === "Currency") {
precision = cint(frappe.defaults.get_default("currency_precision"));
if (!precision) {
- var number_format = get_number_format();
+ var currency = frappe.meta.get_field_currency(df, doc);
+ var number_format = get_number_format(currency);
var number_format_info = get_number_format_info(number_format);
precision = number_format_info.precision;
}
diff --git a/frappe/public/js/frappe/ui/address_autocomplete/autocomplete_dialog.js b/frappe/public/js/frappe/ui/address_autocomplete/autocomplete_dialog.js
index 53d8405ceb..3fb854c15d 100644
--- a/frappe/public/js/frappe/ui/address_autocomplete/autocomplete_dialog.js
+++ b/frappe/public/js/frappe/ui/address_autocomplete/autocomplete_dialog.js
@@ -48,9 +48,6 @@ frappe.ui.AddressAutocompleteDialog = class AddressAutocompleteDialog {
],
primary_action_label: __("Create Address"),
primary_action: () => {
- // Insert the address into the database
- dialog.hide();
-
const address = this.parse_selected_value();
address["doctype"] = "Address";
address["links"] = [
@@ -59,7 +56,8 @@ frappe.ui.AddressAutocompleteDialog = class AddressAutocompleteDialog {
link_name: this.link_name,
},
];
- frappe.db.insert(address).then((doc) => {
+ return frappe.db.insert(address).then((doc) => {
+ dialog.hide();
this.after_insert && this.after_insert(doc);
});
},
diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js
index 036dc0c1cd..40a491a03d 100644
--- a/frappe/public/js/frappe/ui/dialog.js
+++ b/frappe/public/js/frappe/ui/dialog.js
@@ -207,6 +207,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
this.has_primary_action = true;
var me = this;
const primary_btn = this.get_primary_btn().removeClass("hide").html(label);
+ const spinner = ``;
if (typeof click == "function") {
primary_btn.off("click").on("click", function () {
me.primary_action_fulfilled = true;
@@ -215,7 +216,35 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
// if no values then return
var values = me.get_values();
if (!values) return;
- click && click.apply(me, [values]);
+ const action = click.apply(me, [values]);
+ if (action && typeof action.then === "function") {
+ const loading_label = me.primary_action_loading_label;
+ primary_btn
+ .css({
+ "min-width": primary_btn.outerWidth(),
+ "min-height": primary_btn.outerHeight(),
+ })
+ .prop("disabled", true)
+ .addClass("btn-primary-dark")
+ .html(
+ `
+ ${spinner}
+ ${
+ loading_label
+ ? ``
+ : ""
+ }
+
`
+ );
+
+ Promise.resolve(action).finally(() => {
+ primary_btn
+ .css({ "min-width": "", "min-height": "" })
+ .prop("disabled", false)
+ .removeClass("btn-primary-dark")
+ .html(label);
+ });
+ }
});
}
return primary_btn;
diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js
index 98ce569ab5..bf6021fc3c 100644
--- a/frappe/public/js/frappe/ui/field_group.js
+++ b/frappe/public/js/frappe/ui/field_group.js
@@ -18,12 +18,35 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
}
}
+ resolve_date_default_keywords(def_value, fieldtype) {
+ if (!def_value || typeof def_value !== "string") return def_value;
+
+ def_value = def_value.toLowerCase();
+
+ if (def_value == "today" && fieldtype == "Date") {
+ return frappe.datetime.get_today();
+ }
+
+ if (def_value == "now") {
+ if (fieldtype == "Datetime") {
+ return frappe.datetime.now_datetime();
+ }
+ if (fieldtype == "Time") {
+ return frappe.datetime.now_time();
+ }
+ }
+
+ return def_value;
+ }
+
make() {
let me = this;
if (this.fields) {
super.make();
this.refresh();
- // set default
+
+ let defaults = {};
+
$.each(this.fields_list, function (i, field) {
let def_value = field.df["default"];
// loose equality check matches undefined also
@@ -33,12 +56,14 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
)
return;
- if (def_value == "Today" && field.df["fieldtype"] == "Date") {
- def_value = frappe.datetime.get_today();
+ if (["Date", "Datetime", "Time"].includes(field.df.fieldtype)) {
+ def_value = me.resolve_date_default_keywords(def_value, field.df.fieldtype);
}
- field.set_input(def_value);
- // if default and has depends_on, render its fields.
+ defaults[field.df.fieldname] = def_value;
+ });
+
+ this.set_values(defaults).then(() => {
me.refresh_dependency();
});
diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 4b8e013e13..3c6a85f480 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -206,7 +206,7 @@ frappe.msgprint = function (msg, title, is_minimizable, re_route) {
typeof data.primary_action.server_action === "string"
) {
data.primary_action.action = () => {
- frappe.call({
+ return frappe.call({
method: data.primary_action.server_action,
args: data.primary_action.args,
callback() {
diff --git a/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue b/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue
index 9ee883cf31..6104e4d7a3 100644
--- a/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue
+++ b/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue
@@ -306,7 +306,7 @@ function markReset(step) {
{{ __(step.action_label) }}
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index 3d425aae08..2b6d4f4911 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -261,7 +261,7 @@ frappe.dashboard_utils = {
primary_action: (values) => {
values.name = docname;
values.set_standard = frappe.boot.developer_mode;
- frappe.xcall(method, { args: values }).then(() => {
+ return frappe.xcall(method, { args: values }).then(() => {
let dashboard_route_html = `${values.dashboard}`;
let message = __("{0} {1} added to Dashboard {2}", [
doctype,
@@ -270,9 +270,8 @@ frappe.dashboard_utils = {
]);
frappe.msgprint(message);
+ dialog.hide();
});
-
- dialog.hide();
},
});
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index e61e0f3b78..674ff8c8c6 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -328,7 +328,7 @@ Object.assign(frappe.utils, {
scroll_top =
typeof element == "number"
? element - cint(additional_offset)
- : this.get_scroll_position(element, additional_offset);
+ : this.get_scroll_position(element, additional_offset, element_to_be_scrolled);
}
if (scroll_top < 0) {
@@ -366,10 +366,33 @@ Object.assign(frappe.utils, {
element_to_be_scrolled.scrollTop(scroll_top);
}
},
- get_scroll_position: function (element, additional_offset) {
- let header_offset =
- $(".navbar").height() + $(".page-head:visible").height() || $(".navbar").height();
- return $(element).offset().top - header_offset - cint(additional_offset);
+ get_scroll_position: function (element, additional_offset, element_to_be_scrolled) {
+ const get_offset_relative_to_container = () => {
+ let offset = 0;
+
+ let el = element instanceof HTMLElement ? element : element[0];
+ const container = element_to_be_scrolled ? element_to_be_scrolled[0] : null;
+
+ while (el && el !== container && el.offsetParent) {
+ offset += el.offsetTop;
+ el = el.offsetParent;
+ }
+
+ return offset;
+ };
+
+ const get_header_offset = () => {
+ const navbar_height = $(".navbar").height() || 0;
+ const page_head_height = $(".page-head:visible").height() || 0;
+ const tabs_container_height = $(".form-tabs-list:visible").height() || 0;
+
+ return navbar_height + page_head_height + tabs_container_height;
+ };
+
+ const element_offset_top = get_offset_relative_to_container();
+ const header_offset = get_header_offset();
+
+ return element_offset_top - header_offset - cint(additional_offset);
},
filter_dict: function (dict, filters) {
var ret = [];
diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
index 2adaee49fb..9011902091 100644
--- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js
+++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
@@ -449,7 +449,7 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
: chart.chart_type;
chart.document_type = this.doctype;
chart.filters_json = "[]";
- frappe
+ return frappe
.xcall(
"frappe.desk.doctype.dashboard_chart.dashboard_chart.create_dashboard_chart",
{ args: chart }
@@ -460,6 +460,7 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
name: doc.chart_name,
label: chart.label,
});
+ dialog.hide();
});
} else {
this.chart_group.new_widget.on_create({
@@ -467,8 +468,8 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
label: __(chart.chart),
name: chart.chart,
});
+ dialog.hide();
}
- dialog.hide();
},
});
dialog.show();
diff --git a/frappe/public/js/frappe/views/interaction.js b/frappe/public/js/frappe/views/interaction.js
index ba4ebe63d9..b6d6f80cfc 100644
--- a/frappe/public/js/frappe/views/interaction.js
+++ b/frappe/public/js/frappe/views/interaction.js
@@ -17,7 +17,7 @@ frappe.views.InteractionComposer = class InteractionComposer {
fields: me.get_fields(),
primary_action_label: __("Create"),
primary_action: function () {
- me.create_action();
+ return me.create_action();
},
});
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 8693fce7fb..f790aea680 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -2109,7 +2109,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
},
],
primary_action: (values) => {
- frappe.call({
+ return frappe.call({
method: "frappe.desk.query_report.save_report",
args: {
reference_report: this.report_name,
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 68d523b0fa..9bedbf0e11 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -99,16 +99,6 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
});
}
- setup_paging_area() {
- super.setup_paging_area();
- const message = __(
- "For comparison, use >5, <10 or =324. For ranges, use 5:10 (for values between 5 & 10)."
- );
- this.$paging_area.before(
- ``
- );
- }
-
setup_sort_selector() {
this.sort_selector = new frappe.ui.SortSelector({
parent: this.filter_area.$filter_list_wrapper,
@@ -430,6 +420,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
}
setup_inline_filter_observer() {
+ this.setup_inline_filter_help_icons();
+
this.$datatable_wrapper.on(
"keyup",
".dt-filter",
@@ -439,6 +431,29 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
);
}
+ setup_inline_filter_help_icons() {
+ const message = __(
+ "For comparison, use >5, <10 or =324.\nFor ranges, use 5:10 (for values between 5 & 10)."
+ );
+
+ this.$datatable_wrapper.find(".dt-filter").each((_, input) => {
+ const $input = $(input);
+
+ if ($input.siblings(".comparison-help-icon").length) {
+ return;
+ }
+
+ const $icon = $(
+ ``
+ );
+
+ $input.after($icon);
+ });
+ }
+
update_count_for_inline_filter() {
if (!this.datatable) return;
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index f9c1d049cc..eda2048a67 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -570,8 +570,14 @@ export default class ChartWidget extends Widget {
let setup_dashboard_chart = () => {
const chart_args = this.get_chart_args();
+ const is_circular_chart = ["Pie", "Donut", "Percentage"].includes(this.chart_doc.type);
+
if (!this.dashboard_chart) {
this.dashboard_chart = frappe.utils.make_chart(this.chart_wrapper[0], chart_args);
+ } else if (is_circular_chart) {
+ this.chart_wrapper.empty();
+ delete this.dashboard_chart;
+ this.dashboard_chart = frappe.utils.make_chart(this.chart_wrapper[0], chart_args);
} else {
this.dashboard_chart.update(this.data);
}
@@ -619,6 +625,7 @@ export default class ChartWidget extends Widget {
colors: colors,
height: this.height,
maxSlices: this.chart_doc.number_of_groups || max_slices,
+ truncateLegends: 0,
axisOptions: {
xIsSeries: this.chart_doc.timeseries,
shortenYAxisNumbers: 1,
diff --git a/frappe/public/scss/common/grid.scss b/frappe/public/scss/common/grid.scss
index fa03f4d84f..16f7d6b4d3 100644
--- a/frappe/public/scss/common/grid.scss
+++ b/frappe/public/scss/common/grid.scss
@@ -270,6 +270,7 @@
.col:last-child {
border: none;
+ background-color: var(--fg-color);
}
.btn-open-row {
@@ -309,8 +310,8 @@
border-radius: 0px;
border: 0px;
padding-top: 10px;
- padding-bottom: calc(var(--padding-md) - 3px);
- height: auto;
+ padding-bottom: 10px;
+ height: 100%;
}
.link-btn {
@@ -430,6 +431,7 @@
.frappe-control {
margin-bottom: 0px !important;
position: relative;
+ flex-grow: 1;
}
.col-sm-6 {
@@ -779,7 +781,7 @@
.data-row.row {
flex-wrap: nowrap;
}
-.frappe-control[data-fieldtype="Table"].form-group:has(.column-limit-reached) {
+.frappe-control[data-fieldtype="Table"].form-group:has(.column-limit-reached):not(.highlight) {
overflow-x: clip;
}
.column-limit-reached {
diff --git a/frappe/public/scss/common/modal.scss b/frappe/public/scss/common/modal.scss
index 9cd60935c2..ca1ce88ae1 100644
--- a/frappe/public/scss/common/modal.scss
+++ b/frappe/public/scss/common/modal.scss
@@ -2,6 +2,12 @@ h5.modal-title {
margin: 0px !important;
}
+@keyframes spin {
+ to {
+ transform: rotate(360deg);
+ }
+}
+
// Hack to fix incorrect padding applied by Bootstrap
body.modal-open[style^="padding-right"] {
padding-right: 12px !important;
@@ -103,6 +109,11 @@ body.modal-open[style^="padding-right"] {
button:not(:last-child) {
margin-right: var(--margin-xs);
}
+
+ .btn-primary-dark {
+ min-width: 80px;
+ max-width: 200px;
+ }
}
& > * {
diff --git a/frappe/public/scss/desk/list.scss b/frappe/public/scss/desk/list.scss
index 6ac02526f5..65aa1c5b94 100644
--- a/frappe/public/scss/desk/list.scss
+++ b/frappe/public/scss/desk/list.scss
@@ -371,6 +371,27 @@ input.list-header-checkbox {
.list-item-table {
border: 1px solid $border-color;
border-radius: 3px;
+
+ .list-row-head {
+ border-radius: unset;
+ }
+
+ .list-row-container {
+ border-bottom: 1px solid $border-color;
+ border-radius: unset;
+
+ &:last-child {
+ border-bottom: none;
+ }
+ }
+
+ .list-row-container:hover {
+ border-radius: unset;
+ }
+
+ .list-row-container .list-row {
+ border-bottom: none;
+ }
}
.list-item {
diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss
index c476bbe5c0..a84b4719c3 100644
--- a/frappe/public/scss/desk/report.scss
+++ b/frappe/public/scss/desk/report.scss
@@ -93,6 +93,37 @@
border-radius: var(--border-radius);
}
}
+
+.report-view {
+ .layout-main-section {
+ height: calc(100vh - var(--page-head-height));
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+
+ .page-form {
+ flex-shrink: 0;
+ }
+
+ .frappe-list {
+ flex-grow: 1;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+
+ .result,
+ .no-result {
+ flex-grow: 1;
+ overflow: auto;
+ }
+
+ .comparison-message {
+ display: none;
+ }
+ }
+ }
+}
+
@include media-breakpoint-up(sm) {
.report-view {
width: calc(100% - 220px);
@@ -129,6 +160,36 @@
@include get_textstyle("base", "regular");
}
+.report-view {
+ .datatable .dt-row-filter .dt-cell__content {
+ position: relative;
+ }
+
+ .datatable .dt-row-filter .dt-filter.dt-input {
+ padding-inline-end: 1.5rem;
+ }
+
+ .datatable .dt-row-filter .comparison-help-icon {
+ position: absolute;
+ top: 50%;
+ right: 10px;
+ transform: translateY(-50%);
+ display: inline-flex;
+ opacity: 0;
+ pointer-events: none;
+ transition: opacity 0.15s ease;
+
+ .icon {
+ stroke: currentColor;
+ }
+ }
+
+ .datatable .dt-row-filter .dt-filter.dt-input:focus + .comparison-help-icon {
+ opacity: 1;
+ pointer-events: auto;
+ }
+}
+
.list-count {
margin-right: var(--margin-sm);
@include get_textstyle("base", "regular");
diff --git a/frappe/templates/print_format/macros/AttachImage.html b/frappe/templates/print_format/macros/AttachImage.html
index 796662f67a..53d173a2a9 100644
--- a/frappe/templates/print_format/macros/AttachImage.html
+++ b/frappe/templates/print_format/macros/AttachImage.html
@@ -2,6 +2,6 @@
{%- block value -%}
- 
+
{%- endblock -%}
diff --git a/frappe/templates/print_format/macros/Data.html b/frappe/templates/print_format/macros/Data.html
index 722c42ce1a..d04593f330 100644
--- a/frappe/templates/print_format/macros/Data.html
+++ b/frappe/templates/print_format/macros/Data.html
@@ -1,7 +1,7 @@
{% if value %}
{%- block label -%}
-
{% set columns = df.table_columns %}
@@ -9,7 +9,7 @@
{{ df.label }}
+ {{ _(df.label) }}
{%- endblock -%}
{%- block value -%}
{{ doc.get_formatted(df.fieldname) }}
diff --git a/frappe/templates/print_format/macros/Signature.html b/frappe/templates/print_format/macros/Signature.html
index 128ff2a927..909e49f0ab 100644
--- a/frappe/templates/print_format/macros/Signature.html
+++ b/frappe/templates/print_format/macros/Signature.html
@@ -2,6 +2,6 @@
{%- block value -%}
-
+
{%- endblock -%}
diff --git a/frappe/templates/print_format/macros/Table.html b/frappe/templates/print_format/macros/Table.html
index 27c0be961c..a967c923d3 100644
--- a/frappe/templates/print_format/macros/Table.html
+++ b/frappe/templates/print_format/macros/Table.html
@@ -1,7 +1,7 @@
{% if doc.get(df.fieldname) %}
- {{ df.label }}
+ {{ _(df.label) }}
| - {{ column.label }} + {{ _(column.label) }} | {% endfor %}
|---|