brotherton-erpnext/erpnext/hr/doctype
Jamsheer a1bb94e59d Pro-rata component consistency for monthly Salary slip (#14595)
* Pro-rata component consistency for monthly Salary slip

* Resolve merge conflict
2018-06-20 12:41:32 +05:30
..
additional_salary [Fix] Additional Salary Component and tax calculation (#14581) 2018-06-20 10:52:20 +05:30
appraisal [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
appraisal_goal [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
appraisal_template [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
appraisal_template_goal [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
attendance [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
attendance_request Test case for Attendance Request (#14566) 2018-06-19 10:47:40 +05:30
branch [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
compensatory_leave_request options to fetch from migration 2018-05-25 12:52:23 +05:30
daily_work_summary Fix daily work summary test 2018-06-07 11:22:26 +05:30
daily_work_summary_group Send daily work summary alert to only enabled users (#14175) 2018-05-23 10:32:55 +05:30
daily_work_summary_group_user [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
department Fix patch (#14503) 2018-06-13 17:11:17 +05:30
department_approver Fix patch (#14503) 2018-06-13 17:11:17 +05:30
designation [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
driver [New Feature] Delivery 2017-11-20 10:28:49 +08:00
driving_license_category [New Feature] Delivery 2017-11-20 10:28:49 +08:00
employee create user permissions on save of employee 2018-06-15 13:16:44 +05:30
employee_advance [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
employee_attendance_tool [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
employee_benefit_application Pro-rata component consistency for monthly Salary slip (#14595) 2018-06-20 12:41:32 +05:30
employee_benefit_application_detail Employee Benefit (#14571) 2018-06-20 11:04:21 +05:30
employee_benefit_claim Employee Benefit (#14571) 2018-06-20 11:04:21 +05:30
employee_boarding_activity [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
employee_education [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
employee_external_work_history [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
employee_grade New doctypes for HR and Accounting (#13652) 2018-04-26 12:12:29 +05:30
employee_health_insurance Renamed Health Insurance to Employee Health Insurance 2018-04-26 12:16:17 +05:30
employee_incentive [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
employee_internal_work_history [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
employee_onboarding [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
employee_onboarding_activity [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
employee_onboarding_template [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
employee_promotion Employee Transfer allow same company, update internal work history (#14430) 2018-06-11 11:24:44 +05:30
employee_property_history minor fixes 2018-05-07 16:11:35 +05:30
employee_separation [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
employee_separation_template [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
employee_tax_exemption_category HRA fix (#14589) 2018-06-20 11:10:56 +05:30
employee_tax_exemption_declaration HRA tax exemption Indian regional (#14520) 2018-06-14 17:56:16 +05:30
employee_tax_exemption_declaration_category Tax Exemption Declaration - HRA Calculation 2018-05-30 13:37:15 +05:30
employee_tax_exemption_proof_submission HRA tax exemption Indian regional (#14520) 2018-06-14 17:56:16 +05:30
employee_tax_exemption_proof_submission_detail [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
employee_tax_exemption_sub_category Doctype Employee Tax Exemption Sub Category 2018-05-10 15:02:57 +05:30
employee_transfer Employee Transfer allow same company, update internal work history (#14430) 2018-06-11 11:24:44 +05:30
employee_transfer_property New DocTypes for HR Module (#13650) 2018-04-26 12:10:13 +05:30
employment_type [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
expense_claim Merge branch 'master' into develop 2018-06-06 05:53:19 +00:00
expense_claim_account [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
expense_claim_advance Employee advance (#11875) 2017-12-14 13:25:57 +05:30
expense_claim_detail [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
expense_claim_type [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
holiday [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
holiday_list removed color field from sales order and work order 2018-05-01 18:56:06 +05:30
hr_settings Fixed merge conflict 2018-05-05 12:19:14 +05:30
identification_document_type [rename] Photo ID -> Identification Document 2018-05-16 14:12:22 +05:30
interest [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
job_applicant [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
job_offer minor fixes 2018-06-05 14:40:48 +05:30
job_offer_term Rename Offer Letter to Job Offer (#12934) 2018-02-16 10:49:34 +05:30
job_opening Staffing Plan - remove department filter, query by dates (#14590) 2018-06-20 10:48:40 +05:30
leave_allocation Earned Leave (#14143) 2018-06-01 16:09:28 +05:30
leave_application Merge branch 'master' into develop 2018-06-15 09:35:06 +00:00
leave_block_list fix for tests 2018-05-16 13:05:13 +05:30
leave_block_list_allow [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
leave_block_list_date [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
leave_control_panel set query for department based on company 2018-05-14 16:07:28 +05:30
leave_encashment Rename - Additional Salary Component to Additional Salary (#14302) 2018-06-04 11:02:53 +05:30
leave_period Fixed merge conflict 2018-06-04 11:14:50 +05:30
leave_policy Leave Policy - Validate Annual alloction for leave type 2018-05-08 12:36:51 +05:30
leave_policy_detail Removed employee table from Salary Structure and added employee name in all forms 2018-04-26 12:14:01 +05:30
leave_type Update leave_type.json 2018-06-03 15:31:35 +05:30
loan Travis (#14354) 2018-06-05 12:56:10 +05:30
loan_application typo fixed 2018-06-11 18:26:45 +05:30
loan_type Minor fix for ui tests 2017-09-15 19:35:12 +05:30
offer_term [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
payroll_employee_detail [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
payroll_entry salary structure related test case fixes 2018-06-15 14:42:12 +05:30
payroll_period Pro-rata component consistency for monthly Salary slip (#14595) 2018-06-20 12:41:32 +05:30
payroll_period_date New doctypes for HR and Accounting (#13652) 2018-04-26 12:12:29 +05:30
purpose_of_travel [feature] added travel request doctype in HR 2018-05-16 11:02:28 +05:30
repayment_schedule Loan Management for the Members (Non Profit Module) (#13149) 2018-04-24 12:19:36 +05:30
retention_bonus minor ux fix 2018-06-12 16:29:10 +05:30
salary_component Employee Benefit (#14571) 2018-06-20 11:04:21 +05:30
salary_detail Employee benefit - Late employee benefit application (#14465) 2018-06-12 11:30:59 +05:30
salary_slip Pro-rata component consistency for monthly Salary slip (#14595) 2018-06-20 12:41:32 +05:30
salary_slip_loan Loan Management for the Members (Non Profit Module) (#13149) 2018-04-24 12:19:36 +05:30
salary_slip_timesheet [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
salary_structure fix- Salary Structure filter (#14558) 2018-06-18 15:42:38 +05:30
salary_structure_assignment [Fix] HR Fixes (#14511) 2018-06-14 11:55:17 +05:30
salary_structure_employee [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
shift_assignment [Tests] Shift Planning (#14570) 2018-06-19 10:45:33 +05:30
shift_request [Tests] Shift Planning (#14570) 2018-06-19 10:45:33 +05:30
shift_type [Tests] Shift Planning (#14570) 2018-06-19 10:45:33 +05:30
staffing_plan [Tests] Staffing Plan (#14585) 2018-06-20 10:50:54 +05:30
staffing_plan_detail Staffing Plan (#14346) 2018-06-05 11:40:58 +05:30
taxable_salary_slab Update tax calculation (#14564) 2018-06-20 12:33:02 +05:30
training_event [Fix] Filter on child table not working in Calendar (#11824) 2017-12-04 11:22:25 +05:30
training_event_employee [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
training_feedback [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
training_program [minor] Set Rename for Training Program (#11740) 2017-11-28 11:26:23 +05:30
training_result [fixes] email notifications by email alert on training event and result 2017-08-14 11:53:34 +05:30
training_result_employee [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
travel_itinerary [feature] added travel request doctype in HR 2018-05-16 11:02:28 +05:30
travel_request Test case fixes (#14219) 2018-05-26 09:09:02 +05:30
travel_request_costing [feature] added travel request doctype in HR 2018-05-16 11:02:28 +05:30
upload_attendance [minor] remove unnecessary description in upload attendance, fixes #10603 2017-11-14 12:52:53 +05:30
vehicle [fix] Asset test cases and added make_sales_invoice (#11800) 2017-11-30 15:59:40 +05:30
vehicle_log [fix] Asset test cases and added make_sales_invoice (#11800) 2017-11-30 15:59:40 +05:30
vehicle_service [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
__init__.py moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30