diff --git a/foundation/www/assets/img/human-resources/attendence-upload.png b/foundation/www/assets/img/human-resources/attendance-upload.png similarity index 100% rename from foundation/www/assets/img/human-resources/attendence-upload.png rename to foundation/www/assets/img/human-resources/attendance-upload.png diff --git a/foundation/www/assets/img/human-resources/attendence.png b/foundation/www/assets/img/human-resources/attendance.png similarity index 100% rename from foundation/www/assets/img/human-resources/attendence.png rename to foundation/www/assets/img/human-resources/attendance.png diff --git a/foundation/www/docs/assets/img/human-resources/attendence.png b/foundation/www/docs/assets/img/human-resources/attendance.png similarity index 100% rename from foundation/www/docs/assets/img/human-resources/attendence.png rename to foundation/www/docs/assets/img/human-resources/attendance.png diff --git a/foundation/www/docs/user/manual/en/human-resources/attendance.md b/foundation/www/docs/user/manual/en/human-resources/attendance.md deleted file mode 100755 index 46bfad92..00000000 --- a/foundation/www/docs/user/manual/en/human-resources/attendance.md +++ /dev/null @@ -1,18 +0,0 @@ - -# Attendance - -An Attendance record stating that an Employee has been present on a particular -day can be created manually by: - -> Human Resources > Documents > Attendance > New Attendance - -Attendence - -You can get a monthly report of your Attendance data by going to the “Monthly -Attendance Details” report. - -You can easily set attendance for Employees using the [Employee Attendance Tool](/docs/user/manual/en/human-resources/tools/employee-attendance-tool.html) - -You can also bulk upload attendence using the [Upload Attendence Tool](/docs/user/manual/en/human-resources/tools/upload-attendance.html) - -{next} diff --git a/foundation/www/docs/user/manual/en/human-resources/tools/__init__.py b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/__init__.py old mode 100755 new mode 100644 similarity index 100% rename from foundation/www/docs/user/manual/en/human-resources/tools/__init__.py rename to foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/__init__.py diff --git a/foundation/www/docs/user/manual/en/human-resources/attendance-request.md b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/attendance-request.md similarity index 86% rename from foundation/www/docs/user/manual/en/human-resources/attendance-request.md rename to foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/attendance-request.md index 492ff51c..df6ec468 100644 --- a/foundation/www/docs/user/manual/en/human-resources/attendance-request.md +++ b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/attendance-request.md @@ -1,26 +1,26 @@ # Attendance Request -Using the Attendance Request DocType, employees can now submit their attendance request for the days when their attendance wasn't marked. +Using the Attendance Request document, employees can now submit their attendance request for the days when their attendance wasn't marked. Just go to, -> Human Resources > Employee and Attendance > Attendance Request - +> Human Resources > Employee and Attendance > Attendance Request > New Attendance Request + Attendance Request - Fill up the details, mention the dates for which you want the attendance to be marked, reason and explanation. - You can also choose if it has to be marked as a half day or not. -- Save it. +- Save it. - On submission of the same, Attendance documents will be created for the days you mentioned. Attendance Request Submit - + You can see in the below image, Attendance records are linked with Attendance Request which was submitted. - + Attendance Request Linked - + So, if you cancel the Attendance request, the linked Attendance documents created will be cancelled as well. Attendance Request Cancelled -{next} \ No newline at end of file +{next} diff --git a/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/attendance.md b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/attendance.md new file mode 100755 index 00000000..e17d34f0 --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/attendance.md @@ -0,0 +1,18 @@ + +# Attendance + +An Attendance record stating that an Employee has been present on a particular +day can be created manually by: + +> Human Resources > Documents > Attendance > New Attendance + +Attendance + +You can get a monthly report of your Attendance data by going to the _Monthly +Attendance Details_ report. + +You can easily set attendance for Employees using the [Employee Attendance Tool](/docs/user/manual/en/human-resources/employee_and_attendance/employee-attendance-tool.html) + +You can also bulk upload attendance using the [Upload Attendence Tool](/docs/user/manual/en/human-resources/employee_and_attendance/upload-attendance.html) + +{next} diff --git a/foundation/www/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/employee-attendance-tool.md similarity index 62% rename from foundation/www/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md rename to foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/employee-attendance-tool.md index 2f7c336e..571241c7 100755 --- a/foundation/www/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md +++ b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/employee-attendance-tool.md @@ -3,10 +3,10 @@ To go the attendance tool, go to: -> Human Resources > Tools > Employee Attendance Tool +> Human Resources > Employee and Attendance > Employee Attendance Tool This tool allows you to add attendance records for multiple employees quickly. -Attendence upload +Attendance upload -{next} \ No newline at end of file +{next} diff --git a/foundation/www/docs/user/manual/en/human-resources/employee.md b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/employee.md similarity index 91% rename from foundation/www/docs/user/manual/en/human-resources/employee.md rename to foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/employee.md index 7d95fa6d..54575a47 100755 --- a/foundation/www/docs/user/manual/en/human-resources/employee.md +++ b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/employee.md @@ -3,7 +3,7 @@ An individual who works part-time or full-time under a contract of employment, and has recognized rights and duties is your Employee. -In ERPNext, you can manage Employee master. The Employee master captures demographics, personal and professional details. +In ERPNext, you can manage Employee master. The Employee master captures demographics, personal and professional details. Employee @@ -19,7 +19,7 @@ You can further use this Employee master for performing various HR functions lik To create new Employee go to: -> Human Resources > Employee > New +> Human Resources > Employee > New Employee Employee @@ -35,4 +35,4 @@ Once an Employee is created, you can update Department, Designation, Employee to -{next} \ No newline at end of file +{next} diff --git a/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/index.md b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/index.md new file mode 100644 index 00000000..a81f814a --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/index.md @@ -0,0 +1,6 @@ + +# Employee and Attendance + +With ERPNext it's super simple to manage employees, keep track of attendance records etc. ERPNext also allows you to bulk upload attendance of employees. + +{index} diff --git a/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/index.txt b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/index.txt new file mode 100644 index 00000000..0ee047f2 --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/index.txt @@ -0,0 +1,5 @@ +employee +employee-attendance-tool +attendance +attendance-request +upload-attendance diff --git a/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/upload-attendance.md b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/upload-attendance.md new file mode 100755 index 00000000..c2e27029 --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/upload-attendance.md @@ -0,0 +1,12 @@ + +# Upload Attendance + +This tool helps you to upload bulk attendance from a csv file. + +To upload the attendance go to: + +> Human Resources > Upload Attendance + +Attendance upload + +{next} diff --git a/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/__init__.py b/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/en/human-resources/employee-onboarding-and-separation.md b/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/employee-onboarding-and-separation.md similarity index 94% rename from foundation/www/docs/user/manual/en/human-resources/employee-onboarding-and-separation.md rename to foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/employee-onboarding-and-separation.md index 292bc953..5c8ca0c4 100644 --- a/foundation/www/docs/user/manual/en/human-resources/employee-onboarding-and-separation.md +++ b/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/employee-onboarding-and-separation.md @@ -13,12 +13,12 @@ Use Case: Let's assume that following are the activities which need to be perfor Same way, you can have a different set of activities to be performed when relieving an Employee, like: - Disable access from the system -- Collect assets from threlievinge Employee, if any allocated +- Collect assets from the relieving Employee, if any allocated - Collect ID card -- Update employee master +- Update employee master - Perform full and final payment process in the payroll -In ERPNext, these standard activities can be tracked in the Employee Onboarding and Separate Template. +In ERPNext, these standard activities can be tracked in the Employee Onboarding and Separation Template. ### Employee Onboarding Template @@ -55,4 +55,4 @@ Based on the progress on the Tasks, progress can be updated in the Employee Onbo
-
\ No newline at end of file + diff --git a/foundation/www/docs/user/manual/en/human-resources/employee_promotion.md b/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/employee_promotion.md similarity index 100% rename from foundation/www/docs/user/manual/en/human-resources/employee_promotion.md rename to foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/employee_promotion.md diff --git a/foundation/www/docs/user/manual/en/human-resources/employee_transfer.md b/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/employee_transfer.md similarity index 93% rename from foundation/www/docs/user/manual/en/human-resources/employee_transfer.md rename to foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/employee_transfer.md index 3acedb72..6a3228c3 100755 --- a/foundation/www/docs/user/manual/en/human-resources/employee_transfer.md +++ b/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/employee_transfer.md @@ -15,4 +15,4 @@ Transfer document can be submitted on or after Transfer Date. Once submitted all Employee Transfer -> Note : If Create New Employee ID is checked, a new Employee will be created with property changes in Transfer Details table and old Employee will be marked as releived. Leave allocations for the new Employee has to be manually created from Leave Period. +> Note : If Create New Employee ID is checked, a new Employee will be created with property changes in Transfer Details table and old Employee will be marked as relieved. Leave allocations for the new Employee has to be manually created from Leave Period. diff --git a/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/index.md b/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/index.md new file mode 100755 index 00000000..b7cf5797 --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/index.md @@ -0,0 +1,7 @@ + +# Employee Lifecycle Management +Employee lifecycle management relates to the various stages an Employee goes through during the employment with an organization. It is important for most enterprise HR departments to keep records of these changes employees go through across the company. ERPNext simplifies these HR activities, read the following sections to understand how. + +### Topics + +{index} diff --git a/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/index.txt b/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/index.txt new file mode 100755 index 00000000..7ac8e501 --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/employee_lifecycle/index.txt @@ -0,0 +1,3 @@ +employee-promotion +employee-transfer +employee-onboarding-and-separation diff --git a/foundation/www/docs/user/manual/en/human-resources/index.txt b/foundation/www/docs/user/manual/en/human-resources/index.txt index 466f120e..f34e591f 100755 --- a/foundation/www/docs/user/manual/en/human-resources/index.txt +++ b/foundation/www/docs/user/manual/en/human-resources/index.txt @@ -1,39 +1,16 @@ -employee -attendance -attendance-request -leave -leave-application -compensatory-leave-request -leave-encashment -employee-advance -expense-claim -salary-and-payroll -payroll-period -setting-up-tax -additional-salary -employee-benefit-application -employee-benefit-claim -retention-bonus -payroll-entry -employee-tax-exemption-declaration -employee-tax-exemption-proof-submission -shift-management -recruitment +employee-and-attendance +leaves-and-holiday +payroll +travel-and-expense-claim appraisal -job-applicant -job-opening -job-offer -training -tools -human-resources-reports -setup -holiday-list -human-resource-setup -daily-work-summary -health-insurance -fleet-management loan-management -employee-promotion -employee-transfer +training +recruitment +shift-management +fleet-management +daily-work-summary +human-resources-reports +human-resource-setup +setup articles -employee-onboarding-and-separation +tools diff --git a/foundation/www/docs/user/manual/en/human-resources/leave.md b/foundation/www/docs/user/manual/en/human-resources/leave.md deleted file mode 100755 index 909c78d6..00000000 --- a/foundation/www/docs/user/manual/en/human-resources/leave.md +++ /dev/null @@ -1,146 +0,0 @@ - -#Leaves - Overview -This section will help you understand how ERPNext enables you to effectively manage the leave schedule of your organization. It also explains the way employees can apply for leaves. -Employees create leave requests, which their respective managers (leave approver) can approve or reject. An Employee can select from a number of leave types such as sick leave, casual leave, privilege leave and so on. The number and type of leaves an Employee can apply is controlled by Leave Allocations. You can create Leave Allocations for a Leave Period based on the company's Leave Policy. You can also allocate additional leaves to your employees and generate reports to track leaves taken by Employees. - ---- - -#Leave Type -> Human Resources > Leaves and Holiday > Leave Type > New Leave Type - -Leave Type refers to types of leave allotted to an employee by a company. An employee can select a particular Leave Type while requesting for a leave. You can create any number of Leave Types based on your company’s -requirement. - -New Leave Type - -**Max Leaves Allowed:** This field allows you to set the maximum number of leaves of this Leave Type that Employees can apply within a Leave Period. - -**Applicable After (Working Days):** Employees who have worked with the company for this number of days are only allowed to apply for this Leave Type. Do note that any other leaves availed by the Employee after her joining date is also considered while calculating working days. - -**Maximum Continuous Days Applicable:** It refers to maximum number of days this particular Leave Type can be availed at a stretch. If an employee exceeds the maximum number of days under a particular Leave Type, his/her extended leave may be considered as ‘Leave Without Pay’ and this may affect his/her salary calculation. - -**Is Carry Forward:** If checked, the balance leave will be carried forwarded to the next allocation period. - -**Is Leave Without Pay:** This ensures that the Leave Type will be treated as leaves without pay and salary will get deducted for this Leave Type. - -**Allow Negative Balance:** If checked, system will always allow to approve leave application for the Leave Type, even if there is no leave balance. - -**Include holidays within leaves as leaves:** Check this option if you wish to count holidays within leaves as a ‘leave’. Such holidays will be deducted from the total number of leaves. - -**Is Compensatory:** Compensatory leaves are leaves granted for working overtime or on holidays, normally compensated as an encashable leave. You can check this option to mark the Leave Type as compensatory. An Employee can request for compensatory leaves using [Compensatory Leave Request](/docs/user/manual/en/human-resources/compensatory-leave-request.html) and on approval of such requests, Leave Allocation for this leave type is updated allowing her to apply for leaves of this type later on. - -**Is Optional:** Check this Optional Leaves are holidays which Employees can choose to avail from a list of holidays published by the company. The Holiday List for optional leaves can have any number of holidays but you can restrict the number of such leaves granted to an Employee in a Leave Period by setting the Max Days Leave Allowed field. - -**Encashment:** It is possible that Employees can receive cash from their Employer for unused leaves granted to them in a Leave Period. Not all Leave Types need to be encashable, so you should set "Allow Encashment" for Leave Types which are encashable. Leave encashment is allowed only in the last month of the Leave Period. - -Leave Encashment - -You can set the **Encashment Threshold Days** field so that the Employees wont be able to encash that many days. These days should be carry forwarded to the next Leave Period so that it can be either encashed or availed. You may also want to set the **Earning Component** for use in Salary Slip while paying out the encashed amount to Employees as part of their Salary. - ->Note: On submitting a [Leave Encashment](/docs/user/manual/en/human-resources/leave-encashment.html) for an Employee, ERPNext automatically creates an [Additional Salary](/docs/user/manual/en/human-resources/additional-salary.html) which will get added to the Salary Slip of the Employee when processing the next payroll - -**Earned Leave:** Earned Leaves are leaves earned by an employee after working with the company for a certain amount of time. Checking "Is Earned Leave" will allot leaves pro rata by automatically updating Leave Allocation for leaves of this type at intervals set by **Earned Leave Frequency**. For example, if an employee earns 2 leaves of type Paid Leaves monthly, ERPNext automatically increments the Leave Allocation for Paid Leave at the end of every month by 2. The leave allotment process (background job) will only allot leaves considering the max leaves for the leave type, and will round to **Rounding** for fractions. - -Earned Leave - -###Default Leave Types -There are some pre-loaded Leave Types in the system, as below: - -- **Leave Without Pay:** You can avail these leaves for different purposes, such as, extended medical issues, educational purpose or unavoidable personal reason. Employee does not get paid for such leaves. -- **Privilege leave:** These are like earned leaves which can be availed for the purpose of travel, family vacation and so on. -- **Sick leave:** You can avail these leaves if you are unwell. -- **Compensatory off:** These are compensatory leave allotted to employees for overtime work. -- **Casual leave:** You can avail this leave to take care of urgent and unseen matters. - ---- - -#Leave Policy -> Human Resources > Leaves and Holiday > Leave Policy > New Leave Policy - -It is a practice for many enterprises to enforce a general Leave Policy to effectively track and manage Employee leaves. ERPNext allows you to create and manage multiple Leave Policies and allocate leaves to Employees as defined by the policy. - -Leave Policy - -### Enforcing the Leave Policy -To enforce the Leave Policy, you can either: -* Apply the Leave Policy in Employee Grade -Employee Grade - -This will ensure all leave allocations for all employees of this grade will be as per the Leave Policy - -* Update Employee record with appropriate Leave Policy. In case you need to selectively update the Leave Policy for a particular Employee, you can do so by updating the Employee record. - -Employee Leave Policy - -#Leave Period -Most companies manage leaves based on a Leave Period. ERPNext allows you to create a Leave period by going to -> Human Resources > Leaves and Holiday > Leave Period > New Leave Period - - Leave Period - -#Granting Leaves to Employees -Leave Management in ERPNext is based on Leave Allocations created for each employee. This means, Employees can only avail as many leaves (of each Leave Type) allocated to them. There are multiple ways by which you can create Leave Allocations for Employees. - -###Leave Allocation -Leave Allocation enables you to allot a specific number of leaves to a particular employee. You can allocate a number of leaves to different types of leave. - -###Allocating leaves for a Leave Period -> Human Resources > Leaves and Holiday > Leave Period - -Leave Period helps you manage leaves for a period and also doubles up as a tool to help you grant leaves for a category of employees. The **Grant** button will generate Leave Allocations based on the Leave Policy applicable to each Employee. You can allocate leaves based on Employee Grade, Department or Designation. Also, note that **Carry Forward Leaves** check will enable you to carry forward any unused leaves (for Leave Types with Is Carry Forward turned on) from previous allocations to new ones. - -Grant Leaves from Leave Period - -###Manual Allocation of leaves -> Human Resources > Leaves and Holiday > Leave Allocation > New Leave Allocation - -To manually allocate leaves for an Employee, select the period and the number of leaves you want to allocate. You can also add unused leaves from previous allocation period. - -Manual Leave Allocation - ---- - -#Leave Application -> Human Resources > Leaves and Holiday > Leave Application > New Leave Application - -Leave Application 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. - -**Basic Workflow:** - -- Employee applies for leave through Leave Application -- Approver gets notification via email, "Follow via Email" should be checked for this. -- Approver reviews Leave Application -- Approver approves/rejects Leave Application -- Employee gets notification on the status of his/her Leave Application - -Leave Allocation Tool - - -**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. -- Employee can't apply for leave on the dates which are added in the "Leave Block List". - ---- - -#Leave Block List - -> Human Resources > Leaves and Holiday > Leave Block List > New Leave Block List - -Leave Block List is a list of dates in a year, on which employees can not apply for leave. You can define a list of users who can approve Leave Application on blocked days, in case of urgency. You can also define whether the list will applied on entire company or any specific departments. - -Leave Allocation Tool - -{next} diff --git a/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/__init__.py b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/en/human-resources/compensatory-leave-request.md b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/compensatory-leave-request.md similarity index 88% rename from foundation/www/docs/user/manual/en/human-resources/compensatory-leave-request.md rename to foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/compensatory-leave-request.md index 6dccb084..015e1181 100644 --- a/foundation/www/docs/user/manual/en/human-resources/compensatory-leave-request.md +++ b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/compensatory-leave-request.md @@ -1,6 +1,6 @@ # Compensatory Leave Request -ERPNext allows employees to request for compensatory leaves for days which they have worked on holidays. It is necessary that the dates should be in default Holiday List and also that the Employee should have her attendance marked Present. Note that Leave Types which are marked are **Is Compensatory** can be selected in the Compensatory Leave Request. +ERPNext allows employees to request for compensatory leaves for days which they have worked on holidays. It is necessary that the dates should be in default Holiday List and also that the Employee should have her attendance marked Present. Note that Leave Types which are marked are _Is Compensatory_ can be selected in the Compensatory Leave Request. To create a new Compensatory Leave Request, go to > Human Resources > Leaves and Holiday > Compensatory Leave Request > New Compensatory Leave Request diff --git a/foundation/www/docs/user/manual/en/human-resources/holiday-list.md b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/holiday-list.md similarity index 86% rename from foundation/www/docs/user/manual/en/human-resources/holiday-list.md rename to foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/holiday-list.md index c119cca9..a951c95e 100755 --- a/foundation/www/docs/user/manual/en/human-resources/holiday-list.md +++ b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/holiday-list.md @@ -3,34 +3,34 @@ Holiday List is a list which contains the dates of holidays. -Most organisations have a standard Holiday-List for their employees. Some even have different holiday lists based on the different locations or departments. +Most organizations have a standard Holiday-List for their employees. Some even have different holiday lists based on the different locations or departments. To add a new Holiday List, go to: `Human Resources (HR) > Leave and Holiday > Holiday List` Click on New to add new Holiday List. - + ### New Holiday List Give a name to Holiday List. It can be based in Fiscal Year or location or department as application. Also select From and To Date for the Holiday List. -Holiday List +Holiday List You can quickly add Weekly Off in the Holiday List as following. -Holiday List +Holiday List After that, you can also add specific days (like festival holidays) manually. -Holiday List +Holiday List + - ### Holiday List in Employee If you have created multiple Holiday List, then select specific Holiday List for an Employee in the respective master. -Holiday List +Holiday List When an Employee applies for the Leave, then days mentioned in the Holiday List will not be counted, as they are holiday already. For more configuration option in Holiday List, check `HR > HR Settings`. diff --git a/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/index.md b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/index.md new file mode 100755 index 00000000..4e0b58db --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/index.md @@ -0,0 +1,7 @@ + +# Leaves and Holiday +Managing leaves of employees is a very important function every HR. ERPNext allows you to allocate leaves to employees, track leaves of employees and the approval workflows associated with the process. This sections explains this in detail. + +### Topics + +{index} diff --git a/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/index.txt b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/index.txt new file mode 100755 index 00000000..a38e0ee0 --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/index.txt @@ -0,0 +1,5 @@ +leave-application +compensatory-leave-request +leave-encashment +holiday-list +leave diff --git a/foundation/www/docs/user/manual/en/human-resources/leave-application.md b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave-application.md similarity index 57% rename from foundation/www/docs/user/manual/en/human-resources/leave-application.md rename to foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave-application.md index a9b1d86e..23f5a8b2 100755 --- a/foundation/www/docs/user/manual/en/human-resources/leave-application.md +++ b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave-application.md @@ -3,13 +3,24 @@ If your company has a formal system where Employees have to apply for leaves to be able to qualify as paid leaves, you can create Leave Application to -track approval and usage of leaves. You have to mention the Employee, Leave +track approval and usage of leaves. The applying employee requires to select their Employee record, Leave Type and the period for which the leave is taken. > Human Resources > Leaves and Holiday > Leave Application > New Leave Application Leave Application +_Basic Workflow:_ + +- Employee applies for leave through Leave Application +- Approver gets notification via email, "Follow via Email" should be checked for this. +- Approver reviews Leave Application +- Approver approves/rejects Leave Application +- Employee gets notification on the status of his/her Leave Application + +Leave Allocation Tool + ###Setting Leave Approver * A leave approver is a user who can approve an leave application for an employee. @@ -23,7 +34,12 @@ their “Employee ID” as a match rule in the Leave Application Permission settings. See the earlier discussion on [Setting Up Permissions](/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.html) for more info. -To understand how ERPNext allows you configure leaves for employees, check [Leaves - Overview](/docs/user/manual/en/human-resources/leave.html) +_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. +- 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)
-
\ No newline at end of file + diff --git a/foundation/www/docs/user/manual/en/human-resources/expense-claim.md b/foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/expense-claim.md similarity index 96% rename from foundation/www/docs/user/manual/en/human-resources/expense-claim.md rename to foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/expense-claim.md index 424dfe4b..2008fcb7 100755 --- a/foundation/www/docs/user/manual/en/human-resources/expense-claim.md +++ b/foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/expense-claim.md @@ -5,7 +5,7 @@ Expense Claim is made when Employee’s make expenses out of their pocket on beh To make a new Expense Claim, go to: -> HR > Expense Claim > New Expense Claim +> Human Resources > Travel and Expense Claims > Expense Claim > New Expense Claim Expense Claim @@ -54,7 +54,7 @@ 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. Expense Claim diff --git a/foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/index.md b/foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/index.md new file mode 100755 index 00000000..ca24c75f --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/index.md @@ -0,0 +1,7 @@ + +# Travel and Expense Claim +It is a common practice that employees incur expenses for official travel or other petty expenses which they reimburse from the employer periodically. ERPNext helps you efficiently manage advance payments made to employees, travel requests and expense claims and related approval workflows. + +### Topics + +{index} diff --git a/foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/index.txt b/foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/index.txt new file mode 100755 index 00000000..818895ff --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/index.txt @@ -0,0 +1,3 @@ +employee-advance +expense-claim +travel-request diff --git a/foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/travel-request.md b/foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/travel-request.md new file mode 100644 index 00000000..7dab62ef --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/travel_and_expense_claim/travel-request.md @@ -0,0 +1,5 @@ + +#Travel Request +ToDo: writeup, screen grab + +{next}