v11 docs: fixes for leave approver and expense approver change in department, expense claim and leave docs

foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave-application.md

@@ -23,11 +23,7 @@ _Basic Workflow:_
 
 ###Setting Leave Approver
 
-* A leave approver is a user who can approve an leave application for an employee.
+* A leave approver is a user who can approve an leave application for an employee. Leave Approvers for each department can be configured in the [Department](/docs/user/manual/en/human-resources/setup/department.html) master.
-
-* You need to mention a list of Leave Approvers against an Employee in the Employee Master.
-
-<img class="screenshot" alt="Leave Approver" src="{{docs_base_url}}/assets/img/human-resources/employee-leave-approver.png">
 
 > Tip : If you want all users to create their own Leave Applications, you can set
 their “Employee ID” as a match rule in the Leave Application Permission
@@ -35,9 +31,10 @@ settings. See the earlier discussion on [Setting Up Permissions](/docs/user/manu
 for more info.
 
 _Notes:_
-- Leave Application period must be within a single Leave Allocation period. In case, you are applying for leave across leave allocation period, you have to create two Leave Application records.
+
-- Application period must be in the latest Allocation period.
+* Leave Application period must be within a single Leave Allocation period. In case, you are applying for leave across leave allocation period, you have to create two Leave Application records.
-- Employee can't apply for leave on the dates which are added in the "Leave Block List".
+* Application period must be in the latest Allocation period.
+* Employee can't apply for leave on the dates which are added in the "Leave Block List".
 
 To understand how ERPNext allows you configure leaves for employees, check [Leaves - Setup](/docs/user/manual/en/human-resources/leave.html)
 

foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave.md

@@ -123,6 +123,6 @@ Leave Block List is a list of dates in a year, on which employees can not apply
 ##Leave Application
 > Human Resources > Leaves and Holiday > Leave Application > New Leave Application
 
-[Leave Application](/docs/user/manual/en/human-resources/leaves_and_holiday/leave-application.html) section enables an employee to apply for leaves. Employee can select the type of leave and the Leave Approver who will authorize the Leave Application. User with "Leave Approver" role are considered as Leave approver. Leave Approvers can also be restricted/pre-defined in the Employee record. Based on selected dates and applicable Holiday List, total leave days is calculated automatically.
+[Leave Application](/docs/user/manual/en/human-resources/leaves_and_holiday/leave-application.html) section enables an employee to apply for leaves. Employee can select the type of leave and the Leave Approver who will authorize the Leave Application. Leave Approvers for each department can be configured in the [Department](/docs/user/manual/en/human-resources/setup/department.html) master. Based on selected dates and applicable Holiday List, total leave days is calculated automatically.
 
 {next}

foundation/www/docs/user/manual/en/human-resources/setup/department.md

@@ -1,8 +1,12 @@
 <!-- add-breadcrumbs -->
 # Department
 
-Departments in your organization
+You can configure the Departments in your organization, set Leave Block List for the department and also Leave and Expense Approvers.
 
 <img class="screenshot" alt="Department" src="{{docs_base_url}}/assets/img/human-resources/department.png">
 
+It is also possible for you to create and group departments as depicted below.
+
+<img class="screenshot" alt="Department Tree" src="{{docs_base_url}}/assets/img/human-resources/department-tree.png">
+
 {next}

foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/expense-claim.md

@@ -24,12 +24,11 @@ Set employee's expense account on the employee form, system books an expense amo
 
 ### Approving Expenses
 
-Approver for the Expense Claim is selected by an Employee himself. Users to whom `Expense Approver` role is assigned will shown in the Expense Claim Approver field.
+Approver for the Expense Claim is selected by an Employee himself. Employee can choose from the list of users who are configured as _Expense Approvers_ for their [Department](/docs/user/manual/en/human-resources/setup/department.html).
 
 After saving Expense Claim, Employee should [Assign document to Approver](/docs/user/manual/en/using-eprnext/assignment.html). On assignment, approving user will also receive email notification. To automate email notification, you can also setup [Email Alert](/docs/user/manual/en/setting-up/email/email-alerts.html).
 
-Expense Claim Approver can update the “Sanctioned Amounts” against Claimed Amount of an Employee. If submitting, Approval Status should be submitted to Approved or Rejected. If Approved, then Expense Claim gets submitted. If rejected, then Expen
+Expense Claim Approver can update the “Sanctioned Amounts” against Claimed Amount of an Employee. If submitting, Approval Status should be submitted to Approved or Rejected. If Approved, then Expense Claim gets submitted. If rejected, then Expense Approver's comments can be added in the Comments section explaining why the claim was approved or rejected.
-Comments can be added in the Comments section explaining why the claim was approved or rejected.
 
 ### Booking the Expense
 
@@ -54,14 +53,18 @@ Alternatively, a Payment Entry can be made for an employee and all outstanding E
 
 > Accounts > Payment Entry > New Payment Entry
 
-Set the Payment Type to "Pay", the Party Type to Employee, the Party to the employee being paid and the account being paid
+Set the Payment Type to "Pay", the Party Type to Employee, the Party to the employee being paid and the account being paid from. All outstanding expense claims will be pulled in and payments amounts can be allocated to each expense.
-from. All outstanding expense claims will be pulled in and payments amounts can be allocated to each expense.
 <img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/expense_claim_payment_entry.png">
 
 ### Linking with Task & Project
 
 * To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim
 
-<img class="screenshot" alt="Expense Claim - Project Link" src="{{docs_base_url}}/assets/img/project/project_expense_claim_link.png">
+<img class="screenshot" alt="Expense Claim - Project Link" src="{{docs_base_url}}/assets/img/project/project-expense-claim-1.png">
+
+This will update the Project cost with the Expense claim amounts
+
+<img class="screenshot" alt="Expense Claim - Project Link" src="{{docs_base_url}}/assets/img/project/project-expense-claim-2.png">
+
 
 {next}