From 013267655340a8183c0e40baa776a240d3d096cc Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Thu, 12 Feb 2026 12:18:05 +0530 Subject: [PATCH 01/47] fix: consider email account for communication duplicate check --- frappe/core/doctype/communication/communication.py | 2 +- frappe/email/doctype/email_account/test_email_account.py | 6 ++++-- frappe/email/receive.py | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py index 59aefc53bf..16dae174ec 100644 --- a/frappe/core/doctype/communication/communication.py +++ b/frappe/core/doctype/communication/communication.py @@ -419,7 +419,7 @@ class Communication(Document, CommunicationEmailMixin): # Skip timeline links if a "Sent" communication already exists # else will create duplicate timeline entries if self.sent_or_received == "Received" and self.find_one_by_filters( - message_id=self.message_id, sent_or_received="Sent" + message_id=self.message_id, email_account=self.email_account, sent_or_received="Sent" ): return diff --git a/frappe/email/doctype/email_account/test_email_account.py b/frappe/email/doctype/email_account/test_email_account.py index c6f88c2862..93b5c36209 100644 --- a/frappe/email/doctype/email_account/test_email_account.py +++ b/frappe/email/doctype/email_account/test_email_account.py @@ -521,12 +521,14 @@ class TestInboundMail(IntegrationTestCase): def test_mail_exist_validation(self): """Do not create communication record if the mail is already downloaded into the system.""" + email_account = frappe.get_doc("Email Account", "_Test Email Account 1") mail_content = self.get_test_mail(fname="incoming-1.raw") message_id = Email(mail_content).message_id # Create new communication record in DB - communication = self.new_communication(message_id=message_id, sent_or_received="Received") + communication = self.new_communication( + message_id=message_id, email_account=email_account.name, sent_or_received="Received" + ) - email_account = frappe.get_doc("Email Account", "_Test Email Account 1") inbound_mail = InboundMail(mail_content, email_account, 12345, 1) new_communication = inbound_mail.process() diff --git a/frappe/email/receive.py b/frappe/email/receive.py index 8d1c64217a..ce52e98188 100644 --- a/frappe/email/receive.py +++ b/frappe/email/receive.py @@ -721,7 +721,10 @@ class InboundMail(Email): return return Communication.find_one_by_filters( - message_id=self.message_id, sent_or_received="Received", order_by="creation DESC" + message_id=self.message_id, + email_account=self.email_account.name, + sent_or_received="Received", + order_by="creation DESC", ) def is_sender_same_as_receiver(self): From 8e3bd72ef73eb777d814cd0829c734dea7e2a663 Mon Sep 17 00:00:00 2001 From: Sumit Jain Date: Thu, 12 Feb 2026 12:37:53 +0530 Subject: [PATCH 02/47] fix(workflow): add function to retrieve user who set workflow state --- .../workflow_action/workflow_action.py | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/frappe/workflow/doctype/workflow_action/workflow_action.py b/frappe/workflow/doctype/workflow_action/workflow_action.py index 8e04f89500..b3e78f8efa 100644 --- a/frappe/workflow/doctype/workflow_action/workflow_action.py +++ b/frappe/workflow/doctype/workflow_action/workflow_action.py @@ -198,17 +198,57 @@ def return_action_confirmation_page(doc, action, action_link, alert_doc_change=F def return_link_expired_page(doc, doc_workflow_state): + user_full_name = get_user_who_set_workflow_state(doc, doc_workflow_state) or frappe.get_value( + "User", doc.get("modified_by"), "full_name" + ) frappe.respond_as_web_page( _("Link Expired"), _("Document {0} has been set to state {1} by {2}").format( frappe.bold(doc.get("name")), frappe.bold(doc_workflow_state), - frappe.bold(frappe.get_value("User", doc.get("modified_by"), "full_name")), + frappe.bold(user_full_name), ), indicator_color="blue", ) +def get_user_who_set_workflow_state(doc, doc_workflow_state): + """Get the full name of the user who triggered the workflow action that set the document to the given state. + Falls back to None if no completed Workflow Action is found (e.g. state was set without workflow). + """ + workflow_name = get_workflow_name(doc.get("doctype")) + if not workflow_name: + return None + + # Get states that have a transition to the current workflow state + from_states = frappe.get_all( + "Workflow Transition", + filters={"parent": workflow_name, "next_state": doc_workflow_state}, + pluck="state", + ) + if not from_states: + return None + + # Find the most recently completed Workflow Action that led to this state + WorkflowAction = DocType("Workflow Action") + completed_by = ( + frappe.qb.from_(WorkflowAction) + .select(WorkflowAction.completed_by) + .where( + (WorkflowAction.reference_doctype == doc.get("doctype")) + & (WorkflowAction.reference_name == doc.get("name")) + & (WorkflowAction.status == "Completed") + & (WorkflowAction.workflow_state.isin(from_states)) + ) + .orderby(WorkflowAction.modified, order=frappe.qb.desc) + .limit(1) + ).run() + + if completed_by and completed_by[0][0]: + return frappe.get_value("User", completed_by[0][0], "full_name") + return None + + def update_completed_workflow_actions(doc, user=None, workflow=None, workflow_state=None): allowed_roles = get_allowed_roles(user, workflow, workflow_state) # There is no transaction leading upto this state From bbf8f4d75b7f5e9dcc3f2651b9b10c3dcb2a130f Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Mon, 23 Feb 2026 14:41:36 +0530 Subject: [PATCH 03/47] fix: add id to file preview --- frappe/core/doctype/file/file.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/file/file.js b/frappe/core/doctype/file/file.js index f3f1380855..6495aa4c1b 100644 --- a/frappe/core/doctype/file/file.js +++ b/frappe/core/doctype/file/file.js @@ -54,14 +54,14 @@ frappe.ui.form.on("File", { `); } else if (frappe.utils.is_video_file(frm.doc.file_url)) { $preview = $(`
`); @@ -72,14 +72,16 @@ frappe.ui.form.on("File", { style="background:#323639;" width="100%" height="1190" - src="${frappe.utils.escape_html(frm.doc.file_url)}" type="application/pdf" + src="${frappe.utils.escape_html(frm.doc.file_url + "?fid=" + frm.doc.name)}" type="application/pdf" > `); } else if (file_extension === "mp3") { $preview = $(`
`); From 967edf99806c94fec83356c413310d4c8b7fe66d Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 15:09:06 +0530 Subject: [PATCH 04/47] fix: user action designs --- .../js/frappe/form/sidebar/form_sidebar.js | 19 +++-- .../frappe/form/templates/form_sidebar.html | 10 ++- frappe/public/scss/desk/form_sidebar.scss | 80 +++++++++++++++++++ 3 files changed, 101 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js index 29f26b76db..ab02e96ab1 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js @@ -26,6 +26,7 @@ frappe.ui.form.Sidebar = class { .appendTo(this.page.sidebar.empty()); this.user_actions = this.sidebar.find(".user-actions"); + this.user_actions_list = this.sidebar.find(".user-actions-list"); this.image_section = this.sidebar.find(".sidebar-image-section"); this.image_wrapper = this.image_section.find(".sidebar-image-wrapper"); this.make_assignments(); @@ -245,19 +246,23 @@ frappe.ui.form.Sidebar = class { } add_user_action(label, click) { - return $("") - .html(label) - .appendTo( - $('
').appendTo( - this.user_actions.removeClass("hidden") - ) + const parent = this.user_actions_list.length ? this.user_actions_list : this.user_actions; + this.user_actions.removeClass("hidden"); + const row = $('
').appendTo(parent); + + return $('') + .html( + `${label} + ${frappe.utils.icon("external-link", "sm")}` ) + .appendTo(row) .on("click", click); } clear_user_actions() { this.user_actions.addClass("hidden"); - this.user_actions.find(".user-action-row").remove(); + const parent = this.user_actions_list.length ? this.user_actions_list : this.user_actions; + parent.find(".user-action-row").remove(); } refresh_image() {} diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index a43117a67d..30446fe72b 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -1,4 +1,3 @@ -
@@ -82,6 +81,15 @@
{% } %}
+
diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss index fceffe52d7..36a7e411fd 100644 --- a/frappe/public/scss/desk/form_sidebar.scss +++ b/frappe/public/scss/desk/form_sidebar.scss @@ -20,6 +20,10 @@ flex-wrap: wrap; color: var(--text-light); + .icon { + stroke: var(--text-light); + } + .icon-btn { height: unset; } @@ -38,6 +42,82 @@ } } + .user-actions { + display: flex; + flex-direction: column; + gap: 8px; + padding: var(--padding-md); + + .user-actions-list { + display: flex; + flex-direction: column; + gap: 6px; + } + + .user-action-row { + margin: 0; + } + + .user-action-link { + display: flex; + align-items: center; + text-decoration: underline; + justify-content: space-between; + gap: var(--margin-sm); + width: 100%; + padding: 4px 8px; + margin-left: -4px; + margin-right: -8px; + border-radius: var(--border-radius-md); + transition: background-color 120ms ease; + + &:hover, + &:focus-visible { + background: var(--subtle-fg); + } + + &:focus-visible { + outline: none; + } + + .user-action-external-icon { + display: none; + line-height: 0; + + .icon { + margin: 0; + --icon-stroke: var(--text-muted); + } + } + + &[target="_blank"] .user-action-external-icon { + display: inline-flex; + align-items: center; + opacity: 0; + transform: translateX(-2px); + transition: opacity 120ms ease, transform 120ms ease; + } + + &[target="_blank"]:hover .user-action-external-icon, + &[target="_blank"]:focus-visible .user-action-external-icon { + opacity: 1; + transform: translateX(0); + } + } + + .user-action-label { + display: block; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + + .sidebar-section.user-actions.border-bottom { + padding-bottom: 15px; + } + .form-tags { .tag-area { margin-top: -3px; From 8f21eb0e137fc3dc4525cf19a954e3b26b89027a Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 15:09:34 +0530 Subject: [PATCH 05/47] fix: spacing between avatar and user name --- frappe/public/js/frappe/form/sidebar/assign_to.js | 2 +- frappe/public/scss/common/modal.scss | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/assign_to.js b/frappe/public/js/frappe/form/sidebar/assign_to.js index ce4e0ca995..eeed2632fd 100644 --- a/frappe/public/js/frappe/form/sidebar/assign_to.js +++ b/frappe/public/js/frappe/form/sidebar/assign_to.js @@ -286,7 +286,7 @@ frappe.ui.form.AssignmentClass = class AssignmentClass {
${frappe.avatar(assignment)} - ${frappe.user.full_name(assignment)} + ${frappe.user.full_name(assignment)}
diff --git a/frappe/public/scss/common/modal.scss b/frappe/public/scss/common/modal.scss index 3cb388a3fd..936dda7fef 100644 --- a/frappe/public/scss/common/modal.scss +++ b/frappe/public/scss/common/modal.scss @@ -299,6 +299,9 @@ body.modal-open[style^="padding-right"] { } .assignee { flex: 1; + display: flex; + gap: 8px; + align-items: center; } &:hover { .btn-group { @@ -306,9 +309,6 @@ body.modal-open[style^="padding-right"] { transition: opacity 0.1s ease-in-out; } } - .avatar { - margin-right: var(--margin-md); - } } // Stack minimized modals From bd022219ade197624a83267218f6b0b20f46bf94 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 15:09:45 +0530 Subject: [PATCH 06/47] fix: close icon --- frappe/public/js/frappe/form/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index c0da70f26e..893d8abe3e 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -121,7 +121,7 @@ frappe.ui.form.Layout = class Layout { } // Add close button to block if not permanent - const close_message = $(`
${frappe.utils.icon("close")}
`); + const close_message = $(`
${frappe.utils.icon("x")}
`); if (!permanent) { close_message.appendTo($html); close_message.on("click", () => $html.remove()); From 20a946d7f5256c077ddeacb9841aad7242e6ddea Mon Sep 17 00:00:00 2001 From: Akash Tom Date: Mon, 23 Feb 2026 15:21:48 +0530 Subject: [PATCH 07/47] fix(linked documents): pass link specific fieldname to button so that only that field gets populated while creating a new doc --- frappe/model/meta.py | 16 ++++++++++++--- frappe/public/js/frappe/form/dashboard.js | 11 +++++++++- frappe/public/js/frappe/form/form.js | 20 +++++++++++++------ .../js/frappe/form/templates/form_links.html | 4 +++- 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 9e5624252d..add084d38e 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -793,11 +793,21 @@ class Meta(Document): group.get("items").append(doctype) link.added = True + # Add fieldname to transaction group for external links + if not link.is_child_table: + if "fieldnames" not in group: + group["fieldnames"] = {} + group["fieldnames"][link.link_doctype] = link.link_fieldname + if not link.added: # group not found, make a new group - data.transactions.append( - dict(label=link.group, items=[link.parent_doctype or link.link_doctype]) - ) + new_group = dict(label=link.group, items=[link.parent_doctype or link.link_doctype]) + + # Add fieldname to new transaction group for external links + if not link.is_child_table: + new_group["fieldnames"] = {link.link_doctype: link.link_fieldname} + + data.transactions.append(new_group) if not data.fieldname and link.link_fieldname: data.fieldname = link.link_fieldname diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index ddb8ba2e02..7687a55c9b 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -270,6 +270,13 @@ frappe.ui.form.Dashboard = class FormDashboard { if (d.label == group.label) { group_added.push(d.label); group.items.push(...d.items); + + if (d.fieldnames) { + if (!group.fieldnames) { + group.fieldnames = {}; + } + Object.assign(group.fieldnames, d.fieldnames); + } } }); }); @@ -335,7 +342,9 @@ frappe.ui.form.Dashboard = class FormDashboard { // bind new transactions_area_body.find(".btn-new").on("click", function () { - me.frm.make_new($(this).attr("data-doctype")); + const doctype = $(this).attr("data-doctype"); + const fieldname = $(this).attr("data-fieldname"); + me.frm.make_new(doctype, fieldname); }); this.data_rendered = true; diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index cefd7e1527..d77ffb2236 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -2007,7 +2007,7 @@ frappe.ui.form.Form = class FrappeForm { } } - make_new(doctype) { + make_new(doctype, fieldname) { // make new doctype from the current form // will handover to `make_methods` if defined // or will create and match link fields @@ -2021,7 +2021,7 @@ frappe.ui.form.Form = class FrappeForm { let new_doc = frappe.model.get_new_doc(doctype, null, null, true); // set link fields (if found) - me.set_link_field(doctype, new_doc); + me.set_link_field(doctype, new_doc, fieldname); frappe.ui.form.make_quick_entry(doctype, null, null, new_doc); // frappe.set_route('Form', doctype, new_doc.name); @@ -2029,16 +2029,24 @@ frappe.ui.form.Form = class FrappeForm { } } - set_link_field(doctype, new_doc) { + set_link_field(doctype, new_doc, fieldname) { let me = this; frappe.get_meta(doctype).fields.forEach(function (df) { - if (df.fieldtype === "Link" && df.options === me.doctype) { + const isLinkToParent = df.fieldtype === "Link" && df.options === me.doctype; + + if (fieldname) { + if (df.fieldname === fieldname && isLinkToParent) { + new_doc[df.fieldname] = me.doc.name; + } + return; + } + + if (isLinkToParent) { new_doc[df.fieldname] = me.doc.name; } else if (["Link", "Dynamic Link"].includes(df.fieldtype) && me.doc[df.fieldname]) { new_doc[df.fieldname] = me.doc[df.fieldname]; } else if (df.fieldtype === "Table" && df.options && df.reqd) { - let row = new_doc[df.fieldname][0]; - me.set_link_field(df.options, row); + me.set_link_field(df.options, new_doc[df.fieldname][0]); } }); } diff --git a/frappe/public/js/frappe/form/templates/form_links.html b/frappe/public/js/frappe/form/templates/form_links.html index ed6256eaf0..c09709d6cb 100644 --- a/frappe/public/js/frappe/form/templates/form_links.html +++ b/frappe/public/js/frappe/form/templates/form_links.html @@ -9,6 +9,7 @@
{% for (let j=0; j < transactions[i].items.length; j++) { %} {% let doctype = transactions[i].items[j]; %} + {% let fieldname = (transactions[i].fieldnames && transactions[i].fieldnames[doctype]) || transactions[i].fieldname; %}
{{ __(doctype) }} @@ -19,7 +20,8 @@ {% if !internal_links[doctype] %} {% endif %} From 388ed746fba6b8d2546836206ab9561f702c906e Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 15:52:51 +0530 Subject: [PATCH 08/47] fix: alignment of user action row --- frappe/public/scss/desk/form_sidebar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss index 36a7e411fd..ae4914022b 100644 --- a/frappe/public/scss/desk/form_sidebar.scss +++ b/frappe/public/scss/desk/form_sidebar.scss @@ -66,7 +66,7 @@ gap: var(--margin-sm); width: 100%; padding: 4px 8px; - margin-left: -4px; + margin-left: -6px; margin-right: -8px; border-radius: var(--border-radius-md); transition: background-color 120ms ease; From 00e14579ebfe978bd81494aa4289c10f5cd65675 Mon Sep 17 00:00:00 2001 From: Akash Tom Date: Mon, 23 Feb 2026 15:55:28 +0530 Subject: [PATCH 09/47] fix(links): open list with correct filter --- frappe/public/js/frappe/form/dashboard.js | 16 +++++++++------- .../js/frappe/form/templates/form_links.html | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index 7687a55c9b..55015a5103 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -378,6 +378,11 @@ frappe.ui.form.Dashboard = class FormDashboard { let doctype = $link.attr("data-doctype"), names = $link.attr("data-names") || []; + const fieldname = + $link.find(".document-link-badge").attr("data-fieldname") || + (this.data.non_standard_fieldnames && this.data.non_standard_fieldnames[doctype]) || + this.data.fieldname; + if ( this.internal_links_found && this.internal_links_found.find((d) => d.doctype === doctype) @@ -387,8 +392,8 @@ frappe.ui.form.Dashboard = class FormDashboard { } else { return false; } - } else if (this.data.fieldname) { - frappe.route_options = this.get_document_filter(doctype); + } else if (fieldname) { + frappe.route_options = this.get_document_filter(doctype, fieldname); if (show_open && frappe.ui.notifications) { frappe.ui.notifications.show_open_count_list(doctype); } @@ -397,13 +402,10 @@ frappe.ui.form.Dashboard = class FormDashboard { frappe.set_route("List", doctype, "List"); } - get_document_filter(doctype) { + get_document_filter(doctype, fieldname) { // return the default filter for the given document // like {"customer": frm.doc.name} - let filter = {}; - let fieldname = this.data.non_standard_fieldnames - ? this.data.non_standard_fieldnames[doctype] || this.data.fieldname - : this.data.fieldname; + const filter = {}; if (this.data.dynamic_links && this.data.dynamic_links[fieldname]) { let dynamic_fieldname = this.data.dynamic_links[fieldname][1]; diff --git a/frappe/public/js/frappe/form/templates/form_links.html b/frappe/public/js/frappe/form/templates/form_links.html index c09709d6cb..d5788522d4 100644 --- a/frappe/public/js/frappe/form/templates/form_links.html +++ b/frappe/public/js/frappe/form/templates/form_links.html @@ -11,7 +11,7 @@ {% let doctype = transactions[i].items[j]; %} {% let fieldname = (transactions[i].fieldnames && transactions[i].fieldnames[doctype]) || transactions[i].fieldname; %}
-
+
{{ __(doctype) }}
From 74c1c5c9aaf3783c756d0048c3a89b57df56582a Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 16:18:13 +0530 Subject: [PATCH 10/47] refactor: like count and like popover designs --- .../js/frappe/form/sidebar/form_sidebar.js | 3 - .../frappe/form/templates/form_sidebar.html | 2 - frappe/public/js/frappe/ui/like.js | 197 +++++++++++++----- frappe/public/scss/desk/form_sidebar.scss | 35 +++- 4 files changed, 177 insertions(+), 60 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js index ab02e96ab1..907c88b1ad 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js @@ -116,7 +116,6 @@ frappe.ui.form.Sidebar = class { make_like() { this.like_wrapper = this.sidebar.find(".liked-by"); this.like_icon = this.sidebar.find(".liked-by .like-icon"); - this.like_count = this.sidebar.find(".liked-by .like-count"); frappe.ui.setup_like_popover(this.sidebar.find(".form-stats-likes"), ".like-icon"); this.like_icon.on("click", () => { @@ -139,8 +138,6 @@ frappe.ui.form.Sidebar = class { .toggleClass("liked", liked) .attr("data-doctype", this.frm.doctype) .attr("data-name", this.frm.doc.name); - - this.like_count && this.like_count.text(JSON.parse(this.frm.doc._liked_by || "[]").length); } refresh_web_view_count() { diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index 30446fe72b..2f8be66da7 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -24,7 +24,6 @@ -
{% endif %} @@ -50,7 +49,6 @@ -
{% endif %} diff --git a/frappe/public/js/frappe/ui/like.js b/frappe/public/js/frappe/ui/like.js index e4b1c31ee8..2d6c7198be 100644 --- a/frappe/public/js/frappe/ui/like.js +++ b/frappe/public/js/frappe/ui/like.js @@ -1,5 +1,6 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // MIT License. See license.txt +import { createPopper } from "@popperjs/core"; frappe.ui.is_liked = function (doc) { return frappe.ui.get_liked_by(doc).includes(frappe.session.user); @@ -65,63 +66,157 @@ frappe.ui.setup_like_popover = ($parent, selector) => { return; } - $parent.on("mouseover", selector, function () { - const target_element = $(this); - target_element.popover({ - animation: true, - placement: "bottom", - trigger: "manual", - template: `
-
+ let active_target = null; + let active_popover = null; + let active_popper = null; + let hide_timer = null; + + const clear_hide_timer = () => { + if (hide_timer) { + clearTimeout(hide_timer); + hide_timer = null; + } + }; + + const destroy_active_popover = () => { + clear_hide_timer(); + if (active_target) { + active_target.off(".likePopover"); + } + if (active_popover) { + active_popover.off(".likePopover"); + active_popover.remove(); + } + if (active_popper) { + active_popper.destroy(); + } + active_target = null; + active_popover = null; + active_popper = null; + }; + + const schedule_hide = () => { + clear_hide_timer(); + hide_timer = setTimeout(() => { + destroy_active_popover(); + }, 120); + }; + + const get_liked_by_users = (target_element) => { + let liked_by = target_element.parents(".liked-by").attr("data-liked-by"); + liked_by = liked_by ? decodeURI(liked_by) : "[]"; + return JSON.parse(liked_by); + }; + + const get_popover_content = (target_element) => { + const liked_by = get_liked_by_users(target_element); + const content = $('
'); + const like_count = liked_by.length; + + if (like_count > 3) { + const like_summary = __("Liked by {0} people", [like_count]); + const like_count_html = $( + `
${like_summary}
` + ); + content.append(like_count_html); + } + + if (!liked_by.length) { + return content; + } + + const liked_by_list = $('
    '); + const link_base = "/desk/user/"; + + liked_by.forEach((user) => { + liked_by_list.append(` +
  • ${frappe.avatar(user, "avatar-xs")} + ${frappe.user.full_name(user)} +
    • + `); + }); + + liked_by_list.children("li").on("click", (ev) => { + ev.preventDefault(); + ev.stopPropagation(); + const user = ev.currentTarget.dataset.user; + setTimeout(() => destroy_active_popover(), 0); + frappe.set_route(link_base + user); + }); + + content.append(liked_by_list); + return content; + }; + + const show_popover = (target_element) => { + if (!get_liked_by_users(target_element).length) { + destroy_active_popover(); + return; + } + + if (active_target?.get(0) === target_element.get(0) && active_popover) { + clear_hide_timer(); + active_popper?.update(); + return; + } + + destroy_active_popover(); + + const popover = $( + ``, - content: () => { - let liked_by = target_element.parents(".liked-by").attr("data-liked-by"); - liked_by = liked_by ? decodeURI(liked_by) : "[]"; - liked_by = JSON.parse(liked_by); +
    ` + ); - if (!liked_by.length) { - return ""; - } + popover.find(".popover-content").append(get_popover_content(target_element)); + $(document.body).append(popover); - let liked_by_list = $(`
      `); - - // to show social profile of the user - let link_base = "/desk/user/"; - - liked_by.forEach((user) => { - // append user list item - liked_by_list.append(` -
    • ${frappe.avatar(user, "avatar-xs")} - ${frappe.user.full_name(user)} -
      • - `); - }); - - liked_by_list.children("li").click((ev) => { - let user = ev.currentTarget.dataset.user; - target_element.popover("hide"); - frappe.set_route(link_base + user); - }); - - return liked_by_list; - }, - html: true, - container: "body", + const popper = createPopper(target_element.get(0), popover.get(0), { + placement: "bottom", + modifiers: [ + { + name: "offset", + options: { + offset: [0, 8], + }, + }, + { + name: "preventOverflow", + options: { + padding: 12, + }, + }, + { + name: "flip", + options: { + padding: 12, + fallbackPlacements: ["bottom-start", "top", "top-start"], + }, + }, + ], }); - target_element.popover("show"); + active_target = target_element; + active_popover = popover; + active_popper = popper; - $(".popover").on("mouseleave", () => { - target_element.popover("hide"); - }); + target_element + .off(".likePopover") + .on("mouseenter.likePopover", clear_hide_timer) + .on("mouseleave.likePopover", schedule_hide); - target_element.on("mouseout", () => { - setTimeout(() => { - if (!$(".popover:hover").length) { - target_element.popover("hide"); - } - }, 100); - }); + popover + .off(".likePopover") + .on("mousedown.likePopover click.likePopover", (ev) => { + ev.stopPropagation(); + }) + .on("mouseenter.likePopover", clear_hide_timer) + .on("mouseleave.likePopover", schedule_hide); + }; + + $parent.on("mouseenter", selector, function () { + show_popover($(this)); }); + + $parent.on("mouseleave", selector, schedule_hide); }; diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss index ae4914022b..498dbd4916 100644 --- a/frappe/public/scss/desk/form_sidebar.scss +++ b/frappe/public/scss/desk/form_sidebar.scss @@ -222,7 +222,8 @@ } .form-stats-likes { - gap: 8px; + gap: 2px; + margin-top: -2px; .form-print { button:hover { background: var(--btn-default-hover-bg); @@ -495,17 +496,43 @@ body[data-route^="Form"] { } } +.liked-by { + display: flex; + align-items: center; + justify-content: center; + width: 28px; + height: 28px; +} + .liked-by-popover { + max-width: 240px; + border-radius: var(--border-radius-md); + box-shadow: var(--shadow-md); + overflow: hidden; + .popover-body { - min-height: 30px; padding: 0px; + .liked-by-popover-summary { + padding: 4px 10px; + margin: 0; + color: var(--text-muted); + border-bottom: 1px solid var(--subtle-accent); + @include get_textstyle("sm", "regular"); + } + ul.list-unstyled { margin-bottom: 0px; + padding: 4px; li { - padding: var(--padding-xs) var(--padding-sm); - margin: 2px; + display: flex; + align-items: center; + gap: var(--padding-xs); + padding: var(--padding-xs); + margin: 0; + border-radius: var(--border-radius-sm); + cursor: pointer; &:hover { background-color: var(--fg-hover-color); From 8f95c1ccdd05a72eb1e725a2834f6c6d40ab56fb Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 16:34:11 +0530 Subject: [PATCH 11/47] fix: form sidebar title text alignment & weight --- frappe/public/js/frappe/form/templates/form_sidebar.html | 6 +++--- frappe/public/scss/desk/form_sidebar.scss | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index 2f8be66da7..c93b475f08 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -32,14 +32,14 @@
      {% let title = frm.get_title(); %} - {% if (title && title !== frm.doc.name) { %}
      {%= frappe.utils.escape_html(frappe.utils.html2text(title)) %}
      - {% } %} -
      + {% if (title && title !== frm.doc.name) { %} +
      {%= frm.doc.name %}
      + {% } %}
      {% if not image_field %}
      diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss index 498dbd4916..bc29e81f38 100644 --- a/frappe/public/scss/desk/form_sidebar.scss +++ b/frappe/public/scss/desk/form_sidebar.scss @@ -221,9 +221,13 @@ } } + .form-title-text { + // to match the actions button height for center alignment + line-height: 28px; + } + .form-stats-likes { gap: 2px; - margin-top: -2px; .form-print { button:hover { background: var(--btn-default-hover-bg); From 7363ed222a01e545e06c0bcce48d328b507dbfd5 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 16:35:42 +0530 Subject: [PATCH 12/47] refactor: "Report bug" link and experimental badge in form sidebar --- frappe/public/js/frappe/form/form.js | 12 ++++++++++++ .../js/frappe/form/templates/form_sidebar.html | 15 +++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index cefd7e1527..2a07f647fd 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -783,6 +783,7 @@ frappe.ui.form.Form = class FrappeForm { this.show_submit_message(); this.clear_custom_buttons(); this.show_web_link(); + this.show_report_bug_link(); this.show_workflow_read_only_banner(); } @@ -1280,6 +1281,17 @@ frappe.ui.form.Form = class FrappeForm { } } + show_report_bug_link() { + if (this.meta.beta) { + this.add_web_link( + "https://github.com/frappe/" + + frappe.boot.module_app[frappe.scrub(this.meta.module)] + + "/issues/new", + __("Report bug") + ); + } + } + add_web_link(path, label) { label = __(label) || __("See on Website"); this.web_link = this.sidebar diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index c93b475f08..ba71f85f74 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -35,6 +35,11 @@
      {%= frappe.utils.escape_html(frappe.utils.html2text(title)) %}
      + {% if frm.meta.beta %} +
      + +
      + {% endif %} {% if (title && title !== frm.doc.name) { %}
      {%= frm.doc.name %} @@ -53,16 +58,6 @@
      {% endif %}
      - {% if frm.meta.beta %} -
      - - -
      - {% endif %}
      From 65e7e288e0300bfd0f21896345e98cb3cdb8895a Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Tue, 24 Feb 2026 15:25:35 +0530 Subject: [PATCH 13/47] fix: layout shift when editing desktop icons --- frappe/desk/page/desktop/desktop.css | 13 +++++++++++-- frappe/public/js/frappe/ui/desktop_icon.html | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frappe/desk/page/desktop/desktop.css b/frappe/desk/page/desktop/desktop.css index 27a128b60c..b20a18cfb4 100644 --- a/frappe/desk/page/desktop/desktop.css +++ b/frappe/desk/page/desktop/desktop.css @@ -109,6 +109,10 @@ gap: 12px; padding: 13px 16px 12px 16px; position: relative; + border-radius: 20px; + border-width: 1px; + border-style: dashed; + border-color: transparent; } .desktop-icon.desktop-edit-mode .hide-button { display: flex; @@ -343,8 +347,7 @@ } .desktop-edit-mode{ - border: 1px dashed var(--outline-gray-2); - border-radius: 20px; + border-color: var(--outline-gray-2); } .edit-mode-buttons{ display: none; @@ -443,6 +446,12 @@ } } +.icons-container { + > .icons-container { + padding: 0px; + } +} + .desktop-edit{ width: 36px; height: 36px; diff --git a/frappe/public/js/frappe/ui/desktop_icon.html b/frappe/public/js/frappe/ui/desktop_icon.html index f11975cb49..df6bd231eb 100644 --- a/frappe/public/js/frappe/ui/desktop_icon.html +++ b/frappe/public/js/frappe/ui/desktop_icon.html @@ -25,4 +25,4 @@ {%= frappe.utils.icon("x") %}
      {% } %} - \ No newline at end of file + From 304020371fc293c61692abe5057bf36872d37ce3 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Tue, 24 Feb 2026 16:42:09 +0530 Subject: [PATCH 14/47] fix: hide icon subtitle --- frappe/public/js/frappe/ui/desktop_icon.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/desktop_icon.html b/frappe/public/js/frappe/ui/desktop_icon.html index df6bd231eb..60aae5ff54 100644 --- a/frappe/public/js/frappe/ui/desktop_icon.html +++ b/frappe/public/js/frappe/ui/desktop_icon.html @@ -17,7 +17,7 @@ {% if (!in_folder) { %}
      {{ __(icon.label) }}
      -
      +
      {% } %} {% if(!icon.in_folder && !icon.restrict_removal) { %} From 27168f27a1c655ca143ae0480dd5c418ec37c4d3 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Tue, 24 Feb 2026 16:53:45 +0530 Subject: [PATCH 15/47] fix: consistent border radius for desktop icons --- frappe/desk/page/desktop/desktop.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/desk/page/desktop/desktop.css b/frappe/desk/page/desktop/desktop.css index b20a18cfb4..7d5ed7950a 100644 --- a/frappe/desk/page/desktop/desktop.css +++ b/frappe/desk/page/desktop/desktop.css @@ -133,6 +133,7 @@ .icon-container{ padding: 10px; border-radius: 16px; + overflow: hidden; display: flex; align-items: center; justify-content: center; @@ -258,13 +259,13 @@ position: absolute; } -.folder-icon{ - border-radius: 10px; - background-color: var(--folder-icon-background-color) !important; +.folder-icon { + border-radius: 16px; + background-color: var(--folder-icon-background-color) !important; box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.14); padding: 7px; align-items: normal; - box-shadow: 0 0 1px 0 rgba(0, 0, 0, 0.14), 0 1px 3px 0 rgba(0, 0, 0, 0.14); + /* box-shadow: 0 0 1px 0 rgba(0, 0, 0, 0.14), 0 1px 3px 0 rgba(0, 0, 0, 0.14); */ & .icons{ gap: 2.1px; margin-top: 0px; From 6d37b4b8d6638839d6f2919e674c9be792f61ec1 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Tue, 24 Feb 2026 17:21:27 +0530 Subject: [PATCH 16/47] fix: use lucide close icon --- frappe/public/js/bootstrap-4-web.bundle.js | 2 +- frappe/public/js/frappe/ui/messages.js | 2 +- frappe/website/js/bootstrap-4.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/bootstrap-4-web.bundle.js b/frappe/public/js/bootstrap-4-web.bundle.js index 3845a7b185..0d37b745a7 100644 --- a/frappe/public/js/bootstrap-4-web.bundle.js +++ b/frappe/public/js/bootstrap-4-web.bundle.js @@ -25,7 +25,7 @@ frappe.get_modal = function (title, content) {
      ${title}
      diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js index 1e4661f76d..4b8e013e13 100644 --- a/frappe/public/js/frappe/ui/messages.js +++ b/frappe/public/js/frappe/ui/messages.js @@ -442,7 +442,7 @@ frappe.show_alert = frappe.toast = function (message, seconds = 7, actions = {})
      ${message.subtitle || ""}
      - ${frappe.utils.icon("close-alt")} + ${frappe.utils.icon("x")}
      `); diff --git a/frappe/website/js/bootstrap-4.js b/frappe/website/js/bootstrap-4.js index e525d423b6..b95d42ac6a 100644 --- a/frappe/website/js/bootstrap-4.js +++ b/frappe/website/js/bootstrap-4.js @@ -27,7 +27,7 @@ frappe.get_modal = function (title, content) {
      ${title}
      From 32bb391725fc92c343016e7183505b0cd7c33e12 Mon Sep 17 00:00:00 2001 From: prathameshkurunkar7 Date: Tue, 24 Feb 2026 17:47:44 +0530 Subject: [PATCH 17/47] fix(ux): add escape key handling to prevent closing dialog with awesomplete dropdown --- frappe/public/js/frappe/ui/dialog.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index 714edade37..036dc0c1cd 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -128,6 +128,14 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup { ) { $input.blur(); } + }) + .on("keydown", function (e) { + if (e.key === "Escape" || e.keyCode === 27) { + // when dialog is open and contains an awesomplete dropdown - do not close the dialog on escape key press + if (me.display && me.$wrapper.find(".awesomplete").length) { + e.stopImmediatePropagation(); + } + } }); } From 5e71da5dcc45f8e751f5db6c5ff4644d72df0c21 Mon Sep 17 00:00:00 2001 From: sokumon Date: Wed, 25 Feb 2026 00:48:47 +0530 Subject: [PATCH 18/47] fix: show chatwoot popup --- frappe/public/js/billing.bundle.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/billing.bundle.js b/frappe/public/js/billing.bundle.js index 00fd226e1a..445c0b8e90 100644 --- a/frappe/public/js/billing.bundle.js +++ b/frappe/public/js/billing.bundle.js @@ -1,12 +1,12 @@ let frappeCloudBaseEndpoint = "https://frappecloud.com"; -let isFCUser = false; +let isFCUser = true; $(document).ready(function () { const site_info = frappe.boot.site_info; if (site_info) { const trial_end_date = new Date(site_info.trial_end_date); frappeCloudBaseEndpoint = site_info.base_url; - isFCUser = site_info.is_fc_user; + // isFCUser = site_info.is_fc_user; const today = new Date(); const diffTime = trial_end_date - today; @@ -52,6 +52,12 @@ $(document).ready(function () { card_args.parent = $(".icons-container").first(); let banner_card = new frappe.ui.SidebarCard(card_args); } + if (isFCUser) { + let chat_banner = document.createElement("script"); + chat_banner.innerHTML = + '(function(d,t) {var BASE_URL="https://chat.frappe.cloud"; var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.src=BASE_URL+"/packs/js/sdk.js";g.async = true;s.parentNode.insertBefore(g,s);g.onload=function(){window.chatwootSDK.run({websiteToken: "LdmfJzftdJGEcFjoTqk8CrSq",baseUrl: BASE_URL})}})(document,"script");'; + document.body.append(chat_banner); + } addManageBillingDropdown(data.desktop); $(".login-to-fc, .upgrade-plan-button").on("click", function () { From 7758bc49fe10f9c9b743a75fd0e54f82e3720631 Mon Sep 17 00:00:00 2001 From: Sumit Jain Date: Wed, 25 Feb 2026 11:22:41 +0530 Subject: [PATCH 19/47] fix(workflow): improve user retrieval for workflow state changes --- frappe/workflow/doctype/workflow_action/workflow_action.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/workflow/doctype/workflow_action/workflow_action.py b/frappe/workflow/doctype/workflow_action/workflow_action.py index b3e78f8efa..86bd133fed 100644 --- a/frappe/workflow/doctype/workflow_action/workflow_action.py +++ b/frappe/workflow/doctype/workflow_action/workflow_action.py @@ -206,7 +206,11 @@ def return_link_expired_page(doc, doc_workflow_state): _("Document {0} has been set to state {1} by {2}").format( frappe.bold(doc.get("name")), frappe.bold(doc_workflow_state), - frappe.bold(user_full_name), + frappe.bold( + user_full_name + if user_full_name + else frappe.get_value("User", doc.get("modified_by"), "full_name") + ), ), indicator_color="blue", ) From b119168fb25c624a849e762effcc0b4a9b42dd04 Mon Sep 17 00:00:00 2001 From: sokumon Date: Wed, 25 Feb 2026 11:58:52 +0530 Subject: [PATCH 20/47] fix: show widget in business hours --- frappe/public/js/billing.bundle.js | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/billing.bundle.js b/frappe/public/js/billing.bundle.js index 445c0b8e90..b9ae886673 100644 --- a/frappe/public/js/billing.bundle.js +++ b/frappe/public/js/billing.bundle.js @@ -1,12 +1,12 @@ let frappeCloudBaseEndpoint = "https://frappecloud.com"; -let isFCUser = true; +let isFCUser = false; $(document).ready(function () { const site_info = frappe.boot.site_info; if (site_info) { const trial_end_date = new Date(site_info.trial_end_date); frappeCloudBaseEndpoint = site_info.base_url; - // isFCUser = site_info.is_fc_user; + isFCUser = site_info.is_fc_user; const today = new Date(); const diffTime = trial_end_date - today; @@ -52,17 +52,14 @@ $(document).ready(function () { card_args.parent = $(".icons-container").first(); let banner_card = new frappe.ui.SidebarCard(card_args); } - if (isFCUser) { - let chat_banner = document.createElement("script"); - chat_banner.innerHTML = - '(function(d,t) {var BASE_URL="https://chat.frappe.cloud"; var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.src=BASE_URL+"/packs/js/sdk.js";g.async = true;s.parentNode.insertBefore(g,s);g.onload=function(){window.chatwootSDK.run({websiteToken: "LdmfJzftdJGEcFjoTqk8CrSq",baseUrl: BASE_URL})}})(document,"script");'; - document.body.append(chat_banner); - } addManageBillingDropdown(data.desktop); $(".login-to-fc, .upgrade-plan-button").on("click", function () { openFrappeCloudDashboard(); }); + if (isFCUser) { + addChatBubble(); + } } }); } @@ -90,3 +87,19 @@ function openFrappeCloudDashboard() { "_blank" ); } + +function addChatBubble() { + if (checkBusinessHours()) { + let chat_banner = document.createElement("script"); + chat_banner.innerHTML = + '(function(d,t) {var BASE_URL="https://chat.frappe.cloud"; var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.src=BASE_URL+"/packs/js/sdk.js";g.async = true;s.parentNode.insertBefore(g,s);g.onload=function(){window.chatwootSDK.run({websiteToken: "LdmfJzftdJGEcFjoTqk8CrSq",baseUrl: BASE_URL})}})(document,"script");'; + document.body.append(chat_banner); + } +} + +function checkBusinessHours() { + let currentTime = new Date(); + const istTime = new Date(currentTime.toLocaleString("en-US", { timeZone: "Asia/Kolkata" })); + + return istTime.getHours() >= 11 && istTime.getHours() <= 18; +} From 3a11d3cf03cc9678e75cc7c9fcce6ebf5c50a7d4 Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Wed, 25 Feb 2026 12:01:26 +0530 Subject: [PATCH 21/47] fix: cast dates in print preview --- frappe/www/printview.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/www/printview.py b/frappe/www/printview.py index b6b7d9aa8d..8b5e0cbcac 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -342,7 +342,8 @@ def get_html_and_style( if isinstance(name, str): document = frappe.get_lazy_doc(doc, name, check_permission=True) else: - document = frappe.get_doc(json.loads(doc), check_permission=True) + details = json.loads(doc) + document = frappe.get_cached_doc(details["doctype"], details["name"], check_permission=True) print_format = get_print_format_doc(print_format, meta=document.meta) set_link_titles(document) From ffcca31d27d95c5a3f3b1ad0fc8d05a2d5de13c3 Mon Sep 17 00:00:00 2001 From: sokumon Date: Tue, 24 Feb 2026 14:41:28 +0530 Subject: [PATCH 22/47] fix: add a default block in workspace --- .../js/frappe/views/workspace/workspace.js | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 76e6691336..2be9be9ac0 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -493,6 +493,7 @@ frappe.views.Workspace = class Workspace { let blocks = [ { type: "header", + data: { text: values.title }, }, ]; @@ -666,7 +667,6 @@ frappe.views.Workspace = class Workspace { spacer: this.blocks["spacer"], HeaderSize: frappe.workspace_block.tunes["header_size"], }; - this.editor = new EditorJS({ data: { blocks: blocks || [], @@ -676,6 +676,26 @@ frappe.views.Workspace = class Workspace { readOnly: true, logLevel: "ERROR", }); + if (blocks.length == 0) { + let message = __("Welcome to the {0} workspace", [this.page.title]); + let default_block = [ + { + type: "header", + data: { text: message }, + }, + ]; + if (this.has_access) { + default_block.push({ + type: "paragraph", + data: { + text: `Click on ${frappe.utils.icon("ellipsis")} to edit`, + }, + }); + } + this.editor.isReady.then(() => { + this.editor.render({ blocks: default_block }); + }); + } } save_page(page) { From 8ef7d1f7fb2d7af3448ece171e194f4cdf1d2ccd Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Wed, 25 Feb 2026 12:08:01 +0530 Subject: [PATCH 23/47] refactor: use common variable for src url --- frappe/core/doctype/file/file.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/frappe/core/doctype/file/file.js b/frappe/core/doctype/file/file.js index 6495aa4c1b..9df2829307 100644 --- a/frappe/core/doctype/file/file.js +++ b/frappe/core/doctype/file/file.js @@ -48,20 +48,22 @@ frappe.ui.form.on("File", { preview_file: function (frm) { let $preview = ""; let file_extension = frm.doc.file_type.toLowerCase(); + const full_file_url = frm.doc.file_url + "?fid=" + frm.doc.name; + const src_url = frappe.utils.escape_html(full_file_url); - if (frappe.utils.is_image_file(frm.doc.file_url)) { + if (frappe.utils.is_image_file(full_file_url)) { $preview = $(`
      `); - } else if (frappe.utils.is_video_file(frm.doc.file_url)) { + } else if (frappe.utils.is_video_file(full_file_url)) { $preview = $(`
      `); @@ -72,16 +74,14 @@ frappe.ui.form.on("File", { style="background:#323639;" width="100%" height="1190" - src="${frappe.utils.escape_html(frm.doc.file_url + "?fid=" + frm.doc.name)}" type="application/pdf" + src="${src_url}" type="application/pdf" >
      `); } else if (file_extension === "mp3") { $preview = $(`
      `); From 6521b7b4b0651834fbfb28f47204e4d27646188d Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 25 Feb 2026 12:59:47 +0530 Subject: [PATCH 24/47] fix: add promotional banners to sidebar for Frappe CRM --- .../public/js/frappe/ui/sidebar/sidebar.html | 1 + frappe/public/js/frappe/ui/sidebar/sidebar.js | 68 +++++++++++++++++++ frappe/public/scss/desk/sidebar.scss | 15 ++-- 3 files changed, 80 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar.html b/frappe/public/js/frappe/ui/sidebar/sidebar.html index ef5e6d630a..292f9d31b4 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar.html +++ b/frappe/public/js/frappe/ui/sidebar/sidebar.html @@ -40,6 +40,7 @@ Save
      +

      {%= frappe.utils.icon("user-check" , "sm", "", "", "text-ink-gray-7 current-color", true)%} diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar.js b/frappe/public/js/frappe/ui/sidebar/sidebar.js index 84f4665ffd..f6d28f7c0a 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar.js +++ b/frappe/public/js/frappe/ui/sidebar/sidebar.js @@ -78,6 +78,73 @@ frappe.ui.Sidebar = class Sidebar { } } + setup_promotional_banners() { + if (!frappe.user.has_role("System Manager")) return; + + let module = this.all_sidebar_items?.[this.workspace_title]?.["module"] || ""; + if (!module) return; + + this.$promotional_banners = this.wrapper.find(".promotional-banners"); + this.$promotional_banners.empty(); + this.promotional_banners = []; + + this.get_crm_banner(module); + + this.render_promotional_banners(); + } + + get_crm_banner(module) { + if (module != "CRM") return; + + const icon = $(` + + + `); + + const title = __("Switch to Frappe CRM"); + const message = __( + "Frappe CRM helps you work, not slow you down. Open-source, intuitive, and free from extra costs. Give it a try!" + ); + const link = + "https://frappe.io/crm?utm_source=crm-sidebar&utm_medium=sidebar&utm_campaign=frappe-ad"; + + this.promotional_banners.push({ title, message, link, icon }); + } + + render_promotional_banners() { + let me = this; + + if (this.promotional_banners.length === 0) { + this.$promotional_banners.hide(); + return; + } + + this.$promotional_banners.show(); + + this.promotional_banners.forEach((banner) => { + let banner_html = $(` + + ${banner.title} + + `); + + banner_html.prepend(banner.icon); + me.$promotional_banners.append(banner_html); + }); + } + remove_onboarding_wrapper() { this.$onboarding.empty(); this.wrapper.find(".onboarding-sidebar").removeClass("hidden"); @@ -170,6 +237,7 @@ frappe.ui.Sidebar = class Sidebar { this.sidebar_header = new frappe.ui.SidebarHeader(this); this.make_sidebar(); this.add_sidebar_cards(); + this.setup_promotional_banners(); this.setup_onboarding(); this.wrapper.find(".onboarding-sidebar").click(() => { diff --git a/frappe/public/scss/desk/sidebar.scss b/frappe/public/scss/desk/sidebar.scss index 739e2c3b16..5f8c479268 100644 --- a/frappe/public/scss/desk/sidebar.scss +++ b/frappe/public/scss/desk/sidebar.scss @@ -127,7 +127,15 @@ } } - .onboarding-sidebar { + .promotional-banners { + display: flex; + flex-direction: column; + gap: 4px; + margin: var(--margin-sm) 0; + } + + .onboarding-sidebar, + .promotional-banner { text-decoration: none; font-size: var(--text-sm); display: flex; @@ -287,9 +295,8 @@ width: auto; } } - .collapse-sidebar-link { - display: none; - } + .promotional-banners, + .collapse-sidebar-link, .dropdown-navbar-user { display: none; } From 63c256e0660426277532721372814bed866f21f0 Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Wed, 25 Feb 2026 13:02:36 +0530 Subject: [PATCH 25/47] fix: format attached_to_name file field as a link --- frappe/core/doctype/file/file.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frappe/core/doctype/file/file.js b/frappe/core/doctype/file/file.js index f3f1380855..7f99d877d2 100644 --- a/frappe/core/doctype/file/file.js +++ b/frappe/core/doctype/file/file.js @@ -43,6 +43,15 @@ frappe.ui.form.on("File", { if (!frappe.utils.can_upload_public_files() && frm.doc.is_private) { frm.set_df_property("is_private", "read_only", 1); } + + if (frm.doc.attached_to_name) { + const field = frm.get_field("attached_to_name"); + field.$input_wrapper.find(".control-value").html( + ` + ${frm.doc.attached_to_name} + ` + ); + } }, preview_file: function (frm) { From 07cb3e340aaf4b2cc7f74f585fefd3e79d78038e Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 25 Feb 2026 13:11:16 +0530 Subject: [PATCH 26/47] fix: assignment description styles in timeline --- frappe/public/scss/desk/timeline.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/public/scss/desk/timeline.scss b/frappe/public/scss/desk/timeline.scss index e5de39caf7..20d6f98e13 100644 --- a/frappe/public/scss/desk/timeline.scss +++ b/frappe/public/scss/desk/timeline.scss @@ -96,6 +96,11 @@ $threshold: 34; max-width: var(--timeline-content-max-width); padding: var(--padding-sm); margin-left: var(--margin-md); + + > .ql-editor { + display: inline-flex; + } + &.frappe-card { color: var(--text-neutral); background-color: var(--bg-color); From 0e3b17d24026b0ea2bd83a731b8962fe0b4a7414 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 25 Feb 2026 13:54:17 +0530 Subject: [PATCH 27/47] fix: enhance promotional banners setup to respect product suggestion setting --- frappe/public/js/frappe/ui/sidebar/sidebar.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar.js b/frappe/public/js/frappe/ui/sidebar/sidebar.js index f6d28f7c0a..4930672dd7 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar.js +++ b/frappe/public/js/frappe/ui/sidebar/sidebar.js @@ -79,7 +79,11 @@ frappe.ui.Sidebar = class Sidebar { } setup_promotional_banners() { - if (!frappe.user.has_role("System Manager")) return; + if ( + cint(frappe.sys_defaults?.disable_product_suggestion) || + !frappe.user.has_role("System Manager") + ) + return; let module = this.all_sidebar_items?.[this.workspace_title]?.["module"] || ""; if (!module) return; From 9f5abb19050676a59a4f45e40ed58d71a5a07650 Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Wed, 25 Feb 2026 14:06:53 +0530 Subject: [PATCH 28/47] fix: session defaults should not apply to read only fields --- frappe/public/js/frappe/model/create_new.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js index 614ce84b15..e5ca020f3d 100644 --- a/frappe/public/js/frappe/model/create_new.js +++ b/frappe/public/js/frappe/model/create_new.js @@ -148,7 +148,7 @@ $.extend(frappe.model, { allowed_records.length; // don't set defaults for "User" link field using User Permissions! - if (df.fieldtype === "Link" && df.options !== "User") { + if (!df.read_only && df.fieldtype === "Link" && df.options !== "User") { // If user permission has Is Default enabled or single-user permission has found against respective doctype. if (has_user_permissions && default_doc) { value = default_doc; From ff3580bfd6a4962ed3e7f9b8085d68b2ab5b33d2 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 25 Feb 2026 14:22:27 +0530 Subject: [PATCH 29/47] test: Skip gunicorn flaky tests (#37519) Leaving just one of them (gthread). Most failures seem to be from flaky cleanup between tests. --- frappe/commands/test_commands.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/commands/test_commands.py b/frappe/commands/test_commands.py index bd9697d599..f3d9f3d0d9 100644 --- a/frappe/commands/test_commands.py +++ b/frappe/commands/test_commands.py @@ -1116,6 +1116,7 @@ class TestGunicornWorker(IntegrationTestCase): time.sleep(2) execute_in_shell("pgrep gunicorn | xargs -L1 kill -9") + @unittest.skip("Flaky test") def test_gunicorn_ping_sync(self): self.spawn_gunicorn() path = f"http://{self.TEST_SITE}:{self.port}/api/method/ping" @@ -1126,6 +1127,7 @@ class TestGunicornWorker(IntegrationTestCase): path = f"http://{self.TEST_SITE}:{self.port}/api/method/ping" self.assertEqual(requests.get(path).status_code, 200) + @unittest.skip("Flaky test") def test_gunicorn_idle_cpu_usage(self): def get_total_usage(): process = psutil.Process(self.handle.pid) From f99877b3bef194319c817996455a139b623bc9da Mon Sep 17 00:00:00 2001 From: sokumon Date: Wed, 25 Feb 2026 14:23:39 +0530 Subject: [PATCH 30/47] fix: add subtle colors --- frappe/desk/page/desktop/desktop.js | 1 - frappe/public/js/billing.bundle.js | 22 ++++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/frappe/desk/page/desktop/desktop.js b/frappe/desk/page/desktop/desktop.js index 2690d5dd74..8147000152 100644 --- a/frappe/desk/page/desktop/desktop.js +++ b/frappe/desk/page/desktop/desktop.js @@ -286,7 +286,6 @@ class DesktopPage { this.setup_navbar(); this.setup_awesomebar(); this.handle_route_change(); - this.setup_edit_button(); } setup_edit_button() { if (this.edit_mode || frappe.is_mobile()) return; diff --git a/frappe/public/js/billing.bundle.js b/frappe/public/js/billing.bundle.js index b9ae886673..c9bf512844 100644 --- a/frappe/public/js/billing.bundle.js +++ b/frappe/public/js/billing.bundle.js @@ -27,6 +27,14 @@ $(document).ready(function () { dismiss_key: `${frappe.boot.site_info.name}_trial_card_time`, dismiss_it_for: "day", }; + let visiblity_condition = + frappe.boot.is_fc_site && + !!frappe.boot.setup_complete && + !frappe.is_mobile() && + frappe.user.has_role("System Manager"); + if (visiblity_condition && isFCUser) { + addChatBubble(); + } if (isFCUser) { $.extend(card_args, { primary_action_label: "Upgrade", @@ -42,12 +50,7 @@ $(document).ready(function () { }); } $(document).on("desktop_screen", function (event, data) { - if ( - frappe.boot.is_fc_site && - !!frappe.boot.setup_complete && - !frappe.is_mobile() && - frappe.user.has_role("System Manager") - ) { + if (visiblity_condition) { if (site_info.trial_end_date && trial_end_date > new Date()) { card_args.parent = $(".icons-container").first(); let banner_card = new frappe.ui.SidebarCard(card_args); @@ -57,9 +60,6 @@ $(document).ready(function () { $(".login-to-fc, .upgrade-plan-button").on("click", function () { openFrappeCloudDashboard(); }); - if (isFCUser) { - addChatBubble(); - } } }); } @@ -92,8 +92,10 @@ function addChatBubble() { if (checkBusinessHours()) { let chat_banner = document.createElement("script"); chat_banner.innerHTML = - '(function(d,t) {var BASE_URL="https://chat.frappe.cloud"; var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.src=BASE_URL+"/packs/js/sdk.js";g.async = true;s.parentNode.insertBefore(g,s);g.onload=function(){window.chatwootSDK.run({websiteToken: "LdmfJzftdJGEcFjoTqk8CrSq",baseUrl: BASE_URL})}})(document,"script");'; + '(function(d,t){var BASE_URL="https://chat.frappe.cloud";var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.src=BASE_URL+"/packs/js/sdk.js";g.async=true;s.parentNode.insertBefore(g,s);g.onload=function(){window.chatwootSDK.run({websiteToken:"LdmfJzftdJGEcFjoTqk8CrSq",baseUrl:BASE_URL})}})(document,"script");'; document.body.append(chat_banner); + const root = document.documentElement; + root.style.setProperty("--s-700", "var(--gray-50)"); } } From 674734e5c9e347b8364e92ad413c26ee799d3e2e Mon Sep 17 00:00:00 2001 From: Safwan <62411302+safwansamsudeen@users.noreply.github.com> Date: Wed, 25 Feb 2026 14:30:47 +0530 Subject: [PATCH 31/47] refactor: use framework function for form link Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/core/doctype/file/file.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/core/doctype/file/file.js b/frappe/core/doctype/file/file.js index 7f99d877d2..12f7429296 100644 --- a/frappe/core/doctype/file/file.js +++ b/frappe/core/doctype/file/file.js @@ -47,9 +47,7 @@ frappe.ui.form.on("File", { if (frm.doc.attached_to_name) { const field = frm.get_field("attached_to_name"); field.$input_wrapper.find(".control-value").html( - ` - ${frm.doc.attached_to_name} - ` + `${frappe.utils.get_form_link(frm.doctype, frm.docname, true)}` ); } }, From 9d7ef37eb54c2dc8cd527ccc31ba5d28590e705b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 25 Feb 2026 14:43:12 +0530 Subject: [PATCH 32/47] fix: add helpdesk promotional banner to sidebar --- frappe/public/js/frappe/ui/sidebar/sidebar.js | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar.js b/frappe/public/js/frappe/ui/sidebar/sidebar.js index 4930672dd7..a24b17cc5f 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar.js +++ b/frappe/public/js/frappe/ui/sidebar/sidebar.js @@ -93,6 +93,7 @@ frappe.ui.Sidebar = class Sidebar { this.promotional_banners = []; this.get_crm_banner(module); + this.get_helpdesk_banner(module); this.render_promotional_banners(); } @@ -100,26 +101,16 @@ frappe.ui.Sidebar = class Sidebar { get_crm_banner(module) { if (module != "CRM") return; - const icon = $(` - - - `); + const icon = + $(` + + + +`); const title = __("Switch to Frappe CRM"); const message = __( - "Frappe CRM helps you work, not slow you down. Open-source, intuitive, and free from extra costs. Give it a try!" + "Sales without complexity, lock-in and per-user costs. Try it for free!" ); const link = "https://frappe.io/crm?utm_source=crm-sidebar&utm_medium=sidebar&utm_campaign=frappe-ad"; @@ -127,6 +118,26 @@ frappe.ui.Sidebar = class Sidebar { this.promotional_banners.push({ title, message, link, icon }); } + get_helpdesk_banner(module) { + if (module != "Support") return; + + const icon = + $(` + + + +`); + + const title = __("Switch to Helpdesk"); + const message = __( + "Support without complexity, lock-in and per-user costs. Try it for free!" + ); + const link = + "https://frappe.io/helpdesk?utm_source=support-sidebar&utm_medium=sidebar&utm_campaign=frappe-ad"; + + this.promotional_banners.push({ title, message, link, icon }); + } + render_promotional_banners() { let me = this; From da880be91d8ebd4a7a4d569dc23a9c1d68a5168e Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 25 Feb 2026 15:07:36 +0530 Subject: [PATCH 33/47] fix: assign, attachment, tags section designs --- frappe/public/js/frappe/dom.js | 4 +- .../js/frappe/form/sidebar/assign_to.js | 8 +-- frappe/public/scss/desk/avatar.scss | 10 +++ frappe/public/scss/desk/form_sidebar.scss | 66 +++++++++++++++++-- 4 files changed, 75 insertions(+), 13 deletions(-) diff --git a/frappe/public/js/frappe/dom.js b/frappe/public/js/frappe/dom.js index 5d676259a6..0012759e2a 100644 --- a/frappe/public/js/frappe/dom.js +++ b/frappe/public/js/frappe/dom.js @@ -324,8 +324,8 @@ frappe.get_data_pill = ( `); if (remove_action) { let remove_btn = $(` - - ${frappe.utils.icon("close", "sm", "es-icon")} + + ${frappe.utils.icon("x", "sm")} `); if (typeof remove_action === "function") { diff --git a/frappe/public/js/frappe/form/sidebar/assign_to.js b/frappe/public/js/frappe/form/sidebar/assign_to.js index eeed2632fd..6b867fdf51 100644 --- a/frappe/public/js/frappe/form/sidebar/assign_to.js +++ b/frappe/public/js/frappe/form/sidebar/assign_to.js @@ -285,7 +285,7 @@ frappe.ui.form.AssignmentClass = class AssignmentClass { const row = $(`

      - ${frappe.avatar(assignment)} + ${frappe.avatar(assignment, "avatar-smaller")} ${frappe.user.full_name(assignment)}
      @@ -297,8 +297,8 @@ frappe.ui.form.AssignmentClass = class AssignmentClass { if (assignment === frappe.session.user) { btn_group.append(` - `); btn_group.find(".complete-btn").click(() => { @@ -324,7 +324,7 @@ frappe.ui.form.AssignmentClass = class AssignmentClass { if (assignment === frappe.session.user || this.frm.perm[0].write) { btn_group.append(` - `); diff --git a/frappe/public/scss/desk/avatar.scss b/frappe/public/scss/desk/avatar.scss index 7fd2a321e2..059518c414 100644 --- a/frappe/public/scss/desk/avatar.scss +++ b/frappe/public/scss/desk/avatar.scss @@ -98,6 +98,16 @@ } } +.avatar-smaller { + width: 22px; + height: 22px; + text-align: center; + + .standard-image { + @include get_textstyle("xs", "regular"); + } +} + .avatar-medium { width: 28px; height: 28px; diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss index bc29e81f38..f3146dbf9c 100644 --- a/frappe/public/scss/desk/form_sidebar.scss +++ b/frappe/public/scss/desk/form_sidebar.scss @@ -19,6 +19,7 @@ justify-content: space-between; flex-wrap: wrap; color: var(--text-light); + margin-bottom: 8px; .icon { stroke: var(--text-light); @@ -403,30 +404,55 @@ body[data-route^="Form"] { .attachment-row, .form-tag-row { - margin: var(--margin-xs) 0; - max-width: 100%; + margin: 4px 0; .data-pill { @include get_textstyle("sm", "regular"); justify-content: space-between; box-shadow: none; + display: flex; + align-items: center; + height: 24px; + padding: 0px 6px !important; + + .pill-label { + color: inherit !important; + } + + .icon { + stroke: currentColor; + } } } .attachment-row { + margin-left: -6px; + margin-right: 0px; + .data-pill { + display: flex; + align-items: center; + height: 28px; + border-radius: var(--border-radius-md); + padding: 0px 6px !important; background-color: unset; box-shadow: none; - padding-left: 0px !important; width: 100%; + &:hover, + &:focus-within { + background-color: var(--subtle-fg); + } + &:active { background-color: transparent !important; box-shadow: none !important; } + > div { + gap: 8px; + } + .attachment-file-label { display: block; - margin-left: var(--margin-xs); - padding-right: var(--padding-xs); text-align: left; } .attachment-icon { @@ -462,13 +488,39 @@ body[data-route^="Form"] { .form-attachments, .form-tags, .form-shared { - padding: 8px; + padding: var(--padding-sm) var(--padding-md); } .form-assignments, .form-shared { .assignments, .shares { - margin: var(--margin-xs) 0px; + .dialog-assignment-row { + display: flex; + align-items: center; + height: 28px; + border-radius: var(--border-radius-md); + padding: 0px 6px; + margin-left: -8px; + margin-right: 0px; + + &:hover, + &:focus-within { + background-color: var(--subtle-fg); + } + + &:not(:last-child) { + margin-bottom: 4px; + } + + .btn-group { + margin-right: -4px; + } + } + + .view-all-assignment { + display: block; + margin-top: var(--padding-xs); + } } } .add-assignment-btn, From c382901e309b7b599d02118849bc4abe6e8cace1 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 25 Feb 2026 15:29:47 +0530 Subject: [PATCH 34/47] fix: empty state spacing of sections --- frappe/public/scss/desk/form_sidebar.scss | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss index f3146dbf9c..02c7411027 100644 --- a/frappe/public/scss/desk/form_sidebar.scss +++ b/frappe/public/scss/desk/form_sidebar.scss @@ -19,7 +19,6 @@ justify-content: space-between; flex-wrap: wrap; color: var(--text-light); - margin-bottom: 8px; .icon { stroke: var(--text-light); @@ -405,6 +404,7 @@ body[data-route^="Form"] { .attachment-row, .form-tag-row { margin: 4px 0; + .data-pill { @include get_textstyle("sm", "regular"); justify-content: space-between; @@ -490,10 +490,29 @@ body[data-route^="Form"] { .form-shared { padding: var(--padding-sm) var(--padding-md); } + +.form-attachments { + // to add gap between attachment section label and attachments + // without affecting empty state + .attachments-actions + .attachment-row { + margin-top: 8px; + } +} + +.form-tags { + // to add gap between tag section label and tags + // without affecting empty state + :not(.form-tag-row) + .form-tag-row { + margin-top: 8px; + } +} + .form-assignments, .form-shared { .assignments, .shares { + margin-top: 8px; + .dialog-assignment-row { display: flex; align-items: center; From f336219c06ec67033904f1c8ed545f07ec800d00 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 25 Feb 2026 15:40:15 +0530 Subject: [PATCH 35/47] fix: overflow scroll in folder icons --- frappe/desk/page/desktop/desktop.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/page/desktop/desktop.css b/frappe/desk/page/desktop/desktop.css index 7d5ed7950a..1b1c98e919 100644 --- a/frappe/desk/page/desktop/desktop.css +++ b/frappe/desk/page/desktop/desktop.css @@ -91,7 +91,7 @@ padding:0px; margin: 0px; height: 100%; - overflow: auto; + overflow: hidden; } .icons{ gap: 16px; From 793e45da673536ff538d6eff760c1038dd4b8e26 Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Wed, 25 Feb 2026 15:47:13 +0530 Subject: [PATCH 36/47] chore: run pre-commit --- frappe/core/doctype/file/file.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/file/file.js b/frappe/core/doctype/file/file.js index 12f7429296..0792184184 100644 --- a/frappe/core/doctype/file/file.js +++ b/frappe/core/doctype/file/file.js @@ -46,9 +46,9 @@ frappe.ui.form.on("File", { if (frm.doc.attached_to_name) { const field = frm.get_field("attached_to_name"); - field.$input_wrapper.find(".control-value").html( - `${frappe.utils.get_form_link(frm.doctype, frm.docname, true)}` - ); + field.$input_wrapper + .find(".control-value") + .html(`${frappe.utils.get_form_link(frm.doctype, frm.docname, true)}`); } }, From 2b2fb7e0c1b294b62d831a2d6c89d7d0ca8c8b35 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 25 Feb 2026 15:54:06 +0530 Subject: [PATCH 37/47] fix: button title shows svg element --- frappe/public/js/frappe/form/controls/button.js | 2 +- frappe/public/js/frappe/views/communication.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/button.js b/frappe/public/js/frappe/form/controls/button.js index 41fd49b5af..c4f70c5501 100644 --- a/frappe/public/js/frappe/form/controls/button.js +++ b/frappe/public/js/frappe/form/controls/button.js @@ -24,7 +24,7 @@ frappe.ui.form.ControlButton = class ControlButton extends frappe.ui.form.Contro this.$input = $( ` @@ -249,7 +249,7 @@ function markReset(step) {
      {{ title }}
      - {{ completedCount }}/{{ steps.length }} steps completed + {{ completedCount }}/{{ steps.length }} {{ __("steps completed") }}
      @@ -297,8 +297,11 @@ function markReset(step) {
      - - {{ step.action_label }} + + {{ __(step.action_label) }}
      @@ -306,7 +309,7 @@ function markReset(step) { class="text-base onb-step-text" style="text-decoration-line: line-through" > - {{ step.action_label }} + {{ __(step.action_label) }}
      diff --git a/frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js b/frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js index c75170d28b..3ed2215733 100644 --- a/frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js +++ b/frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js @@ -67,7 +67,7 @@ function addStyles() { position: fixed; right: 24px; bottom: 24px; - width: 380px; + width: 310px; max-height: 80vh; background: #fff; border-radius: 16px; From 88da896790801b3334b5b8150709c0b68bec8a02 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Wed, 25 Feb 2026 17:27:24 +0530 Subject: [PATCH 41/47] fix: Translate user facing string --- frappe/public/js/frappe/views/workspace/workspace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 2be9be9ac0..8ecde380be 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -688,7 +688,7 @@ frappe.views.Workspace = class Workspace { default_block.push({ type: "paragraph", data: { - text: `Click on ${frappe.utils.icon("ellipsis")} to edit`, + text: __("Click on {0} to edit", [frappe.utils.icon("ellipsis")]), }, }); } From c0184e96bd010316563c4c9ad54ec22e980b19c6 Mon Sep 17 00:00:00 2001 From: sokumon Date: Wed, 25 Feb 2026 17:31:55 +0530 Subject: [PATCH 42/47] fix(minor): folder icon styles --- frappe/desk/page/desktop/desktop.css | 4 ++-- frappe/desk/page/desktop/desktop.js | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/frappe/desk/page/desktop/desktop.css b/frappe/desk/page/desktop/desktop.css index 1b1c98e919..ef5e4e6062 100644 --- a/frappe/desk/page/desktop/desktop.css +++ b/frappe/desk/page/desktop/desktop.css @@ -2,7 +2,7 @@ --desktop-blur: blur(10.2px); --desktop-modal-width: 590px; --desktop-modal-height: 450px; - --folder-thumbnail-icon-height: 12px; + --folder-thumbnail-icon-height: 16px; --desktop-icon-dimension: 54px; --folder-icon-background-color: var(--surface-gray-1); --desktop-modal-radius: 30px; @@ -368,7 +368,7 @@ :root { --desktop-icon-dimension: 50px; --desktop-icon-container: 117px; - --folder-thumbnail-icon-height:17px; + --folder-thumbnail-icon-height:15px; } .desktop-container { diff --git a/frappe/desk/page/desktop/desktop.js b/frappe/desk/page/desktop/desktop.js index 8147000152..514af59374 100644 --- a/frappe/desk/page/desktop/desktop.js +++ b/frappe/desk/page/desktop/desktop.js @@ -1086,11 +1086,6 @@ class DesktopIcon { this.folder_grid = new DesktopIconGrid({ wrapper: this.folder_wrapper, icons_data: this.child_icons, - row_size: 3, - page_size: { - row: 3, - col: 3, - }, in_folder: true, in_modal: false, no_dragging: true, From f9f06dbb9bf8426f7267207dbebfafbe0216d07e Mon Sep 17 00:00:00 2001 From: Akash Tom Date: Wed, 25 Feb 2026 18:46:14 +0530 Subject: [PATCH 43/47] fix: check for fieldname while setting open count --- frappe/public/js/frappe/form/dashboard.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index 55015a5103..5c0ad48de3 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -417,10 +417,14 @@ frappe.ui.form.Dashboard = class FormDashboard { } set_open_count() { + const has_fieldname = + this.data.fieldname || + (this.data.transactions && this.data.transactions.some((group) => group.fieldnames)); + if ( !this.data || !this.data.transactions || - !this.data.fieldname || + !has_fieldname || this.frm.is_new() || this._fetched_counts ) { From d4338a1cd9d821d39377f8c79060aec70b9d99b8 Mon Sep 17 00:00:00 2001 From: Akash Tom Date: Wed, 25 Feb 2026 20:45:17 +0530 Subject: [PATCH 44/47] fix: populate child table with linked field --- frappe/public/js/frappe/form/dashboard.js | 3 +-- frappe/public/js/frappe/form/form.js | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index 5c0ad48de3..0e8413f98b 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -418,8 +418,7 @@ frappe.ui.form.Dashboard = class FormDashboard { set_open_count() { const has_fieldname = - this.data.fieldname || - (this.data.transactions && this.data.transactions.some((group) => group.fieldnames)); + this.data.fieldname || this.data.transactions?.some((group) => group.fieldnames); if ( !this.data || diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 26f45e6213..2570864ee3 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -2050,6 +2050,9 @@ frappe.ui.form.Form = class FrappeForm { if (df.fieldname === fieldname && isLinkToParent) { new_doc[df.fieldname] = me.doc.name; } + if (df.fieldtype === "Table" && df.options && df.reqd) { + me.set_link_field(df.options, new_doc[df.fieldname][0]); + } return; } From aa9093ba569931e6f5d5c81ebe83adfba14ab890 Mon Sep 17 00:00:00 2001 From: Akash Tom Date: Wed, 25 Feb 2026 21:24:00 +0530 Subject: [PATCH 45/47] revert: f9f06dbb9bf8426f7267207dbebfafbe0216d07e --- frappe/public/js/frappe/form/dashboard.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index 0e8413f98b..55015a5103 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -417,13 +417,10 @@ frappe.ui.form.Dashboard = class FormDashboard { } set_open_count() { - const has_fieldname = - this.data.fieldname || this.data.transactions?.some((group) => group.fieldnames); - if ( !this.data || !this.data.transactions || - !has_fieldname || + !this.data.fieldname || this.frm.is_new() || this._fetched_counts ) { From c554641e58b570c54f47c74f77e5521536dad995 Mon Sep 17 00:00:00 2001 From: sokumon Date: Thu, 26 Feb 2026 01:58:41 +0530 Subject: [PATCH 46/47] chore: update pypdf --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d0bf7066b3..306aab4d3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ dependencies = [ # We depend on internal attributes, # do NOT add loose requirements on PyMySQL versions. "PyMySQL==1.1.2", - "pypdf==6.7.1", + "pypdf==6.7.2", "PyPika @ git+https://github.com/frappe/pypika@2c50e6142b2d61d2d243e466fdd5dc03b3d918f2", "mysqlclient==2.2.7", "PyQRCode~=1.2.1", From 85464f7031e7d7e8005144334e540569df099bc8 Mon Sep 17 00:00:00 2001 From: sokumon Date: Thu, 26 Feb 2026 01:37:23 +0530 Subject: [PATCH 47/47] fix: business hours in popup,theme and apps for which to show --- frappe/public/js/billing.bundle.js | 10 +++++++--- frappe/public/js/frappe/utils/utils.js | 12 ++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/billing.bundle.js b/frappe/public/js/billing.bundle.js index c9bf512844..79e0609c58 100644 --- a/frappe/public/js/billing.bundle.js +++ b/frappe/public/js/billing.bundle.js @@ -89,13 +89,17 @@ function openFrappeCloudDashboard() { } function addChatBubble() { - if (checkBusinessHours()) { + const all_apps = frappe.utils.get_installed_apps(); + const desk_apps = ["erpnext", "hrms"]; + + const apps_allowed = frappe.utils.is_sub_array(all_apps, desk_apps); + if (checkBusinessHours && apps_allowed) { let chat_banner = document.createElement("script"); chat_banner.innerHTML = '(function(d,t){var BASE_URL="https://chat.frappe.cloud";var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.src=BASE_URL+"/packs/js/sdk.js";g.async=true;s.parentNode.insertBefore(g,s);g.onload=function(){window.chatwootSDK.run({websiteToken:"LdmfJzftdJGEcFjoTqk8CrSq",baseUrl:BASE_URL})}})(document,"script");'; document.body.append(chat_banner); const root = document.documentElement; - root.style.setProperty("--s-700", "var(--gray-50)"); + root.style.setProperty("--s-700", "var(--gray-500)"); } } @@ -103,5 +107,5 @@ function checkBusinessHours() { let currentTime = new Date(); const istTime = new Date(currentTime.toLocaleString("en-US", { timeZone: "Asia/Kolkata" })); - return istTime.getHours() >= 11 && istTime.getHours() <= 18; + return istTime.getHours() >= 11 && istTime.getHours() < 18; } diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index fb888880f3..e61e0f3b78 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -2229,4 +2229,16 @@ Object.assign(frappe.utils, { } return value; }, + get_installed_apps() { + return frappe.boot.app_data.map((app) => { + return app.app_name; + }); + }, + is_sub_array(big, small) { + let i = 0; + for (let num of big) { + if (num === small[i]) i++; + } + return i === small.length; + }, });