diff --git a/docs/user/setup/docs.user.setup.sms.md b/docs/user/setup/docs.user.setup.sms.md
index 7be3d9e236..64892b93fd 100644
--- a/docs/user/setup/docs.user.setup.sms.md
+++ b/docs/user/setup/docs.user.setup.sms.md
@@ -11,18 +11,18 @@ Example URL:
http://instant.smses.com/web2sms.php?username=<USERNAME>&password=<PASSWORD>&to=<MOBILENUMBER>&sender=<SENDERID>&message=<MESSAGE>-![SMS Settings](img/sms-settings2.jpg) +![SMS Settings](img/sms-setting2.jpg) -> Note: the characters up to the "?" are the SMS Gateway URL +> Note: the string up to the "?" is the SMS Gateway URL Example:
http://instant.smses.com/web2sms.php?username=abcd&password=abcd&to=9900XXXXXX&sender =DEMO&message=THIS+IS+A+TEST+SMS-The above URL will send SMS from account abcd to mobile number 9900XXXXXX with sender ID as DEMO with text message as THIS IS A TEST SMS +The above URL will send SMS from account abcd to mobile number 9900XXXXXX with sender ID as DEMO with text message as "THIS IS A TEST SMS" Note that some parameters in the URL are static.You will get static values from your SMS Provider like username, password etc. These static values should be entered in the Static Parameters table. diff --git a/docs/user/setup/docs.user.setup.workflows.md b/docs/user/setup/docs.user.setup.workflows.md index ff9ec423d6..62850a1c8f 100644 --- a/docs/user/setup/docs.user.setup.workflows.md +++ b/docs/user/setup/docs.user.setup.workflows.md @@ -3,10 +3,16 @@ "_label": "Workflows" } --- -In order to allow multiple people to submit multiple requests, for approvals, by multiple users, ERPNext requires you to fill the workflow conditions. -ERPNext tracks the multiple permissions before submission. +In order to allow multiple people to submit multiple requests, for approvals, by multiple users, ERPNext requires you to fill the workflow conditions. ERPNext tracks the multiple permissions before submission. + +Example of a leave application workflow is given below: + +If an user applies for a leave, then his request will be sent to the HR department. The HR department(HR User) will either reject or approve this request. Once this process is completed, the user's Manager(leave approver) will get an indication that the HR department has Accepted or Rejected. The Manager, who is the approving authority, will either Approve or Reject this request. Accordingly,the user will get his Approved or Rejected status. + +![Workflow](img/workflow-leave-fl.jpg) + + -For Example, Multiple users may wish to apply for a leave. This request will be sent to the HR department. The HR department will either reject or approve. Once this process is completed, the user's Manager(leave approver) will get an indication that the HR department has accepted or rejected. Depending on the Managers approving authority, he will either override the HR request or continue to endorse it. Accordingly,the user will get his approval or rejected status. To make this Workflow and transition rules go to : @@ -28,3 +34,18 @@ To make this Workflow and transition rules go to : Example of a Leave Application Process. Go to the Human Resources Module and click on Leave Application. Apply for a Leave. + +When a Leave Application is submitted, the status on the right hand corner of the page shows as "Applied" + +![Workflow Employee LA](img/workflow-employee-la.png) + +When the HR User logs in, he can either approve or reject. If approved the status on the right hand corner of the page shows as Approved. However, a blue band of information is displayed saying approval is pending by leave approver. + +![Leave Approver](img/workflow-hr-user-la.png) + + +When the leave approver opens the Leave Application page, he should update the status to Accepted or rejected. + +![Workflow Leave Approver](img/workflow-leave-approver-la.png) + +