From 249adb06803f8b686392cb99a79b7f0cb8fc6ad0 Mon Sep 17 00:00:00 2001 From: sokumon Date: Tue, 21 Apr 2026 01:13:13 +0530 Subject: [PATCH 1/3] fix: spacing between group by label --- frappe/public/js/frappe/ui/group_by/group_by.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/group_by/group_by.js b/frappe/public/js/frappe/ui/group_by/group_by.js index dfb8e06dd4..2b5cd9bfdd 100644 --- a/frappe/public/js/frappe/ui/group_by/group_by.js +++ b/frappe/public/js/frappe/ui/group_by/group_by.js @@ -431,7 +431,9 @@ frappe.ui.GroupBy = class { this.get_group_by_field_label(), ]) : __("Add Group"); - + if (group_by_applied) { + this.group_by_button.find(".button-label").css("gap", "4px"); + } this.group_by_button .toggleClass("btn-default", !group_by_applied) .toggleClass("btn-primary-light", group_by_applied); From e33097fd359186a6dfb63816d079d50a80a4ae43 Mon Sep 17 00:00:00 2001 From: sokumon Date: Tue, 21 Apr 2026 02:48:53 +0530 Subject: [PATCH 2/3] fix(dialog): send default value in dialog --- frappe/public/js/frappe/ui/field_group.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js index ea7d2fa2e2..f40038fe55 100644 --- a/frappe/public/js/frappe/ui/field_group.js +++ b/frappe/public/js/frappe/ui/field_group.js @@ -142,7 +142,7 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { for (let key in this.fields_dict) { let f = this.fields_dict[key]; if (f.get_value) { - let v = f.get_value(); + let v = f.get_value() || f.df.default; if (f.df.reqd && is_null(typeof v === "string" ? strip_html(v) : v)) errors.push(__(f.df.label)); From a8ca40b4449d6b6f4cde1e788d784be30fdfa997 Mon Sep 17 00:00:00 2001 From: sokumon Date: Tue, 21 Apr 2026 16:58:54 +0530 Subject: [PATCH 3/3] fix(dialog): add a flag to include default value --- frappe/public/js/frappe/ui/field_group.js | 5 ++++- frappe/public/js/frappe/views/reports/report_view.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js index f40038fe55..d23d75197a 100644 --- a/frappe/public/js/frappe/ui/field_group.js +++ b/frappe/public/js/frappe/ui/field_group.js @@ -142,7 +142,10 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { for (let key in this.fields_dict) { let f = this.fields_dict[key]; if (f.get_value) { - let v = f.get_value() || f.df.default; + let v = f.get_value(); + if (!v && f.df.include_default) { + v = f.df.default; + } if (f.df.reqd && is_null(typeof v === "string" ? strip_html(v) : v)) errors.push(__(f.df.label)); diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 7eeee457c9..05d4637757 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -579,6 +579,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { options: y_fields, description: __("Showing only Numeric fields from Report"), default: defaults.y_axes ? defaults.y_axes.join(", ") : null, + include_default: true, }, { label: __("Chart Type"),