From 0bc2e197b28bb779a5b99e9eae43087172fee093 Mon Sep 17 00:00:00 2001 From: sokumon Date: Mon, 24 Mar 2025 02:29:27 +0530 Subject: [PATCH 1/3] fix: configure if email is sent to creator --- .../doctype/workflow_action/workflow_action.py | 3 ++- .../workflow_transition/workflow_transition.json | 13 +++++++++++-- .../workflow_transition/workflow_transition.py | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/frappe/workflow/doctype/workflow_action/workflow_action.py b/frappe/workflow/doctype/workflow_action/workflow_action.py index 70544dd4bf..a3462d8d7a 100644 --- a/frappe/workflow/doctype/workflow_action/workflow_action.py +++ b/frappe/workflow/doctype/workflow_action/workflow_action.py @@ -299,7 +299,8 @@ def get_users_next_action_data(transitions, doc): filtered_users = [ user for user in users if has_approval_access(user, doc, transition) and user_has_permission(user) ] - + if doc.get("owner") and not transition.get("send_email_to_creator"): + filtered_users.remove(doc.get("owner")) for user in filtered_users: if not user_data_map.get(user): user_data_map[user] = frappe._dict( diff --git a/frappe/workflow/doctype/workflow_transition/workflow_transition.json b/frappe/workflow/doctype/workflow_transition/workflow_transition.json index dc6570b908..e033e3ff89 100644 --- a/frappe/workflow/doctype/workflow_transition/workflow_transition.json +++ b/frappe/workflow/doctype/workflow_transition/workflow_transition.json @@ -11,6 +11,7 @@ "next_state", "allowed", "allow_self_approval", + "send_email_to_creator", "conditions", "condition", "column_break_7", @@ -91,18 +92,26 @@ "fieldtype": "Data", "hidden": 1, "label": "Workflow Builder ID" + }, + { + "default": "1", + "depends_on": "eval: doc.allow_self_approval === \"1\"", + "fieldname": "send_email_to_creator", + "fieldtype": "Check", + "label": "Send Email To Creator" } ], "idx": 1, "istable": 1, "links": [], - "modified": "2024-03-23 16:04:05.493534", + "modified": "2025-03-24 02:03:23.926703", "modified_by": "Administrator", "module": "Workflow", "name": "Workflow Transition", "owner": "Administrator", "permissions": [], + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] -} \ No newline at end of file +} diff --git a/frappe/workflow/doctype/workflow_transition/workflow_transition.py b/frappe/workflow/doctype/workflow_transition/workflow_transition.py index f6f7d2b1da..6d467e01e3 100644 --- a/frappe/workflow/doctype/workflow_transition/workflow_transition.py +++ b/frappe/workflow/doctype/workflow_transition/workflow_transition.py @@ -22,6 +22,7 @@ class WorkflowTransition(Document): parent: DF.Data parentfield: DF.Data parenttype: DF.Data + send_email_to_creator: DF.Check state: DF.Link workflow_builder_id: DF.Data | None # end: auto-generated types From 216223abc81b002ea8fd0ccce3e3b6bdde690078 Mon Sep 17 00:00:00 2001 From: sokumon Date: Mon, 24 Mar 2025 02:57:53 +0530 Subject: [PATCH 2/3] fix: typo --- frappe/workflow/doctype/workflow_action/workflow_action.py | 2 +- .../doctype/workflow_transition/workflow_transition.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/workflow/doctype/workflow_action/workflow_action.py b/frappe/workflow/doctype/workflow_action/workflow_action.py index a3462d8d7a..1bb11a3a2c 100644 --- a/frappe/workflow/doctype/workflow_action/workflow_action.py +++ b/frappe/workflow/doctype/workflow_action/workflow_action.py @@ -299,7 +299,7 @@ def get_users_next_action_data(transitions, doc): filtered_users = [ user for user in users if has_approval_access(user, doc, transition) and user_has_permission(user) ] - if doc.get("owner") and not transition.get("send_email_to_creator"): + if doc.get("owner") in filtered_users and not transition.get("send_email_to_creator"): filtered_users.remove(doc.get("owner")) for user in filtered_users: if not user_data_map.get(user): diff --git a/frappe/workflow/doctype/workflow_transition/workflow_transition.json b/frappe/workflow/doctype/workflow_transition/workflow_transition.json index e033e3ff89..b5391d9743 100644 --- a/frappe/workflow/doctype/workflow_transition/workflow_transition.json +++ b/frappe/workflow/doctype/workflow_transition/workflow_transition.json @@ -95,7 +95,7 @@ }, { "default": "1", - "depends_on": "eval: doc.allow_self_approval === \"1\"", + "depends_on": "eval: doc.allow_self_approval == 1", "fieldname": "send_email_to_creator", "fieldtype": "Check", "label": "Send Email To Creator" @@ -104,7 +104,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2025-03-24 02:03:23.926703", + "modified": "2025-03-24 02:47:44.188152", "modified_by": "Administrator", "module": "Workflow", "name": "Workflow Transition", From 1320c97a4b647747a004a7c3b37fba7f4333facd Mon Sep 17 00:00:00 2001 From: sokumon Date: Mon, 24 Mar 2025 12:11:18 +0530 Subject: [PATCH 3/3] fix: set default to not send email to self --- .../doctype/workflow_transition/workflow_transition.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/workflow/doctype/workflow_transition/workflow_transition.json b/frappe/workflow/doctype/workflow_transition/workflow_transition.json index b5391d9743..74139320f4 100644 --- a/frappe/workflow/doctype/workflow_transition/workflow_transition.json +++ b/frappe/workflow/doctype/workflow_transition/workflow_transition.json @@ -94,7 +94,7 @@ "label": "Workflow Builder ID" }, { - "default": "1", + "default": "0", "depends_on": "eval: doc.allow_self_approval == 1", "fieldname": "send_email_to_creator", "fieldtype": "Check", @@ -110,7 +110,6 @@ "name": "Workflow Transition", "owner": "Administrator", "permissions": [], - "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": []