diff --git a/erpnext/docs/assets/img/setup/workflow-6.png b/erpnext/docs/assets/img/setup/workflow-6.png new file mode 100644 index 00000000000..a13d17c75e7 Binary files /dev/null and b/erpnext/docs/assets/img/setup/workflow-6.png differ diff --git a/erpnext/docs/assets/img/setup/workflow-actions-email.png b/erpnext/docs/assets/img/setup/workflow-actions-email.png new file mode 100644 index 00000000000..0fe3bca3a02 Binary files /dev/null and b/erpnext/docs/assets/img/setup/workflow-actions-email.png differ diff --git a/erpnext/docs/assets/img/setup/workflow-actions-list.png b/erpnext/docs/assets/img/setup/workflow-actions-list.png new file mode 100644 index 00000000000..cb8ccc27c7f Binary files /dev/null and b/erpnext/docs/assets/img/setup/workflow-actions-list.png differ diff --git a/erpnext/docs/user/manual/en/setting-up/workflows.md b/erpnext/docs/user/manual/en/setting-up/workflows.md index 5d037d29267..a667bb12e0e 100644 --- a/erpnext/docs/user/manual/en/setting-up/workflows.md +++ b/erpnext/docs/user/manual/en/setting-up/workflows.md @@ -42,6 +42,14 @@ submit button / option if you have not specified it in the workflow. > Note 4: If you wish to give the option to cancel, you will have to write a workflow transition step that says from submitted you can cancel. + +#### Enable/Disable Self approval + +> New in Version 11 + +Workflow + + #### Conditions > New in Version 11 @@ -81,3 +89,19 @@ When the Leave Approver opens the Leave Application page, he can finally "Approv {next} + +#### Workflow Actions + +> New in Version 11 + +Workflow Actions facilitates communication to the users via email and also creates a list of pending Workflow Actions. + +For example, when an employee creates a leave application the next actions would be to Approve or Reject that application. +Based on allowed roles to perform these actions, users will be sent email with Next Action buttons and a print format of the application. +Also the users will see entries in Workflow Action list. +Workflow +Workflow + +Note: You can set email template for Workflow Actions on each state. +The template might consist message for users to proceed with the next Workflow Actions +