diff --git a/erpnext_documentation/www/docs/assets/img/human-resources/hr-settings1.png b/erpnext_documentation/www/docs/assets/img/human-resources/hr-settings1.png index 72fe37d6a..202c644de 100644 Binary files a/erpnext_documentation/www/docs/assets/img/human-resources/hr-settings1.png and b/erpnext_documentation/www/docs/assets/img/human-resources/hr-settings1.png differ diff --git a/erpnext_documentation/www/docs/assets/img/human-resources/hr-settings3.png b/erpnext_documentation/www/docs/assets/img/human-resources/hr-settings3.png index 5ea881744..60ac935be 100644 Binary files a/erpnext_documentation/www/docs/assets/img/human-resources/hr-settings3.png and b/erpnext_documentation/www/docs/assets/img/human-resources/hr-settings3.png differ diff --git a/erpnext_documentation/www/docs/assets/img/human-resources/is-partially-paid-leaves.png b/erpnext_documentation/www/docs/assets/img/human-resources/is-partially-paid-leaves.png index b6f49b79e..0f03069b1 100644 Binary files a/erpnext_documentation/www/docs/assets/img/human-resources/is-partially-paid-leaves.png and b/erpnext_documentation/www/docs/assets/img/human-resources/is-partially-paid-leaves.png differ diff --git a/erpnext_documentation/www/docs/assets/img/human-resources/new-leave-type.png b/erpnext_documentation/www/docs/assets/img/human-resources/new-leave-type.png index b87c32a41..f03ce01e0 100644 Binary files a/erpnext_documentation/www/docs/assets/img/human-resources/new-leave-type.png and b/erpnext_documentation/www/docs/assets/img/human-resources/new-leave-type.png differ diff --git a/erpnext_documentation/www/docs/user/manual/en/human-resources/hr-settings.md b/erpnext_documentation/www/docs/user/manual/en/human-resources/hr-settings.md index e5d568761..a0c49658d 100755 --- a/erpnext_documentation/www/docs/user/manual/en/human-resources/hr-settings.md +++ b/erpnext_documentation/www/docs/user/manual/en/human-resources/hr-settings.md @@ -14,32 +14,38 @@ There are various settings available in the HR Settings. Previous Work Experience -### 1.1. Retirement Age: -You can enter the retirement age (in years) for your employees. -### 1.2 Employee Records to be created by +### 1.1 Employee Naming By +> Know as "Employee Records to be created by" till version-12 + The naming for employee documents is based on the value selected in this field. * **Naming Series**: The employee documents created will be named using the naming series selected in the 'Series' field. * **Employee Number**: The Employee Number field becomes visible in selecting this field, and the naming of the employee document happens based on this field. * **Full Name**: The employee document is named using the full name of the employee. -### 1.3 Stop Birthday Reminders +### 1.2 Standard Working Hours +You can define standard Working for day for you employee. + +### 1.3 Retirement Age: +You can enter the retirement age (in years) for your employees. + + +### 1.4 Stop Birthday Reminders An email is sent to all the employees of the company when an employee has a birthday. To stop this email from being sent you can check this option. -### 1.4 Expense Approver Mandatory In Expense Claim -In Expense Claim Document the 'Expense Approver' field is set to mandatory on checking this option. -> Payroll Settings will be part of HR Settings till version 12. In version 13, Payroll Settings will be part of the new module, Payroll. ## 2. Payroll Settings +> Payroll Settings was part of HR Settings till version 12. In version 13, Payroll Settings will be the part of the new module, Payroll. + Previous Work Experience -#### 2.1 Calculate Payroll Working Days Based On +### 2.1 Calculate Payroll Working Days Based On Working Days in Salary Slip can be calculated based on Leave Application or Attendance records. You can select the option based on what you want to calculate working days. -#### 2.2 Max working hours against Timesheet +### 2.2 Max working hours against Timesheet For salary slips based on the timesheet, you can set the maximum allowed hours against a single timesheet. Set this value to zero to disable this validation. ### 2.3 Include holidays in Total no. of Working Days @@ -70,35 +76,53 @@ SAL-{first_name}-{date_of_birth.year} This will generate a password like SAL-Jane-1972 -## 3. Leave Settings +## 3. Leave and Expense Claim Settings Previous Work Experience -### 3.1 Leave Approval Notification Template -On creating or updating a leave application with a leave approver, an email is sent to this leave approver notifying about the new leave application. The email template used for this purpose can be selected here. -### 3.2 Leave Status Notification Template -On Submission/Cancellation of a leave application, the employee receives an email with the updated status of their leave application. The email template used for this purpose can be selected here. +### 3.1 Leave Approver Mandatory In Leave Application -### 3.3 Leave Approver Mandatory In Leave Application In Leave Application document the 'Leave Approver' field is set to mandatory on checking this option. -### 3.4 Show Leaves Of All Department Members In Calendar + +### 3.2 Show Leaves Of All Department Members In Calendar + The approved leaves of all employees in the same department are shown in the calendar view on checking this option. -### 3.5 Auto Leave Encashment +### 3.3 Auto Leave Encashment If checked, the system generates a draft Leave Encashment record on the expiry of the leave allocation for all encashable Leave Types. -### 3.6 Restrict Backdated Leave Application -If checked, the system will not allow making a backdated leave application. +### 3.4 Expense Approver Mandatory In Expense Claim +In Expense Claim Document the 'Expense Approver' field is set to mandatory on checking this option. + +### 3.5 Leave Approval Notification Template +> Was part of HR Setting till Version-12 + +On creating or updating a leave application with a leave approver, an email is sent to this leave approver notifying about the new leave application. The email template used for this purpose can be selected here. + +### 3.6 Leave Status Notification Template +> Was part of HR Setting till Version-12 + +On Submission/Cancellation of a leave application, the employee receives an email with the updated status of their leave application. The email template used for this purpose can be selected here. + +### 3.7 Allow Backdated Leave Application +If unchecked, the system will not allow making a backdated leave application. + +### 3.8 Role Allowed to Create Backdated Leave Application +This field will appear when *Allow Backdated Leave Application*. select role, Only User with respective role will be allowed to created backdated entry. + + +### 3.8 Automatic Allocate Leaves Based On Leave Policy > Introduced in version 13 -### 3.7 Automatic Allocate Leaves Based On Leave Policy If checked, leaves will be granted to the employees automatically based on the Effective From date as per the present Leave Policy Assignment. ## 4. Hiring Settings +> Hiring Settings was part of HR Settings till version-12. In Version 13 This feature was Deprecated. + ### 4.1 Check Vacancies On Job Offer Creation On the creation of a job offer for a particular position, vacancies present in the staffing plan for that position are checked to warn the user from over hiring for a particular position. diff --git a/erpnext_documentation/www/docs/user/manual/en/human-resources/leave-type.md b/erpnext_documentation/www/docs/user/manual/en/human-resources/leave-type.md index 0eb23cf42..6c9845722 100644 --- a/erpnext_documentation/www/docs/user/manual/en/human-resources/leave-type.md +++ b/erpnext_documentation/www/docs/user/manual/en/human-resources/leave-type.md @@ -21,11 +21,15 @@ To access Leave Type, go to: Below is a detailed explanation of all the fields and checkboxes in Leave Type. -* **Max Leaves Allowed:** This field allows you to set the maximum number of the annual allocation of this Leave Type while creating the Leave Policy. +* **Maximum Leave Allocation Allowed:** This field allows you to set the maximum number of the annual allocation of this Leave Type while creating the Leave Policy. + +> Known as "Max Leaves Allowed" till version-12. * **Applicable After (Working Days):** Enter the minimum number of working days here. Only the employees who have worked for this number of days or more will be allowed to apply for this particular leave type. Any other leaves (such as Casual Leave, Sick Leave.etc.) availed by the Employees after their joining date will also be considered while calculating working days of the Employee. -* **Maximum Continuous Days Applicable:** It refers to the maximum number of days this particular Leave Type can be availed at a stretch. If an employee exceeds the maximum number of days, their extended leave will be considered as ‘Leave Without Pay'. +* **Maximum Consecutive Leaves Allowed:** It refers to the maximum number of days this particular Leave Type can be availed at a stretch. If an employee exceeds the maximum number of days, their extended leave will be considered as ‘Leave Without Pay'. + +> Known as "Maximum Continuous Days Applicable" till version-12. * **Is Carry Forward:** If checked, the balance leaves of this Leave Type will be carried forward to the next allocation period. @@ -84,9 +88,13 @@ For example, an Employee is allotted 24 Privilege Leaves in a year, wherein the 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 purposes, or unavoidable personal reasons. The 'Leave Without Pay' checkbox for this Leave Type is checked by default. The employee does not get paid for such leaves. + - **Privilege leave:** These are like earned leaves that can be availed for travel, family vacation, and so on. + - **Sick leave:** You can avail of these leaves if you are unwell. + - **Compensatory off:** These are compensatory leaves allotted to employees for overtime work. The 'Is Compensatory' checkbox for this Leave Type is checked by default. + - **Casual leave:** You can avail of this leave to take care of urgent and unseen matters. ## 3. Related Topics