Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
brotherton-erpnext/erpnext/hr/doctype
History
Mangesh-Khairnar f984bee5f9
fix: duplicate leave expiry creation (#21505) 
* fix: validate existing ledger entries to avoid duplicates

* patch: remove duplicate ledger entries created

* fix: consider only submitted ledger entries

* fix: delete duplicate leaves from the ledger

* fix: check if duplicate ledger entry exists

* chore: formatting changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-15 11:55:42 +05:30
..
additional_salary
fix: Patch and tests
2020-05-05 15:58:52 +05:30
appointment_letter
fix: conflicts
2020-02-27 13:16:53 +05:30
appointment_letter_content
fix: conflicts
2020-02-27 13:16:53 +05:30
appointment_letter_template
fix: conflicts
2020-02-27 13:16:53 +05:30
appraisal
Fix: Precision in Appraisals (#17673)
2019-05-27 13:57:56 +05:30
appraisal_goal
…
appraisal_template
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
appraisal_template_goal
…
attendance
Module Import Fix (#21433)
2020-04-27 10:57:02 +05:30
attendance_request
fix: conflicts
2020-02-27 13:16:53 +05:30
branch
…
compensatory_leave_request
fix(compensatory leave request): Create leave ledger entry on submit/cancel (#19476)
2019-12-09 14:27:38 +05:30
daily_work_summary
fix: conflicts
2020-02-27 13:16:53 +05:30
daily_work_summary_group
refactor(HR): Auto Attendance
2019-06-24 15:15:38 +05:30
daily_work_summary_group_user
…
department
fix: Merge branch 'develop' into healthcare_refactor
2020-03-25 02:08:42 +05:30
department_approver
feat: fetch leave approver from both employee and department approvers (#19613)
2019-11-19 15:07:30 +05:30
designation
Enhancement(HR): hiring process (#18129)
2019-07-22 11:47:53 +05:30
designation_skill
feat: Add employee training section to the employee skill map
2019-04-18 12:46:33 +05:30
driver
fixes: internal issues (#19201)
2019-10-11 11:09:10 +05:30
driving_license_category
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
employee
feat: add Bank Account to dashboards
2020-04-28 18:56:47 +02:00
employee_advance
fix: conflicts
2020-05-04 13:56:07 +05:30
employee_attendance_tool
fix: conflicts
2020-02-27 13:16:53 +05:30
employee_benefit_application
fix: Merge branch 'develop' into healthcare_refactor
2020-03-25 02:08:42 +05:30
employee_benefit_application_detail
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
employee_benefit_claim
fix: conflicts
2020-02-27 13:16:53 +05:30
employee_boarding_activity
fix: set task weight from onboarding template (#17840)
2019-06-05 10:26:01 +05:30
employee_checkin
fix: employee checkin doctype time permissions (#20403)
2020-01-27 16:03:24 +05:30
employee_education
…
employee_external_work_history
…
employee_grade
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
employee_group
feat(Support): Service Level Agreements (#16828)
2019-03-19 16:47:56 +05:30
employee_group_table
feat: Add user_id of employee to employee group
2019-06-06 14:47:40 +05:30
employee_health_insurance
…
employee_incentive
feat: reverse linking and multiple additonal salaries in salary slip
2020-03-13 19:14:56 +05:30
employee_internal_work_history
…
employee_loan
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
employee_onboarding
fix(employee onboarding): stop showing irrelevant job offer links for a job applicant (#20053)
2019-12-23 19:02:29 +05:30
employee_onboarding_activity
…
employee_onboarding_template
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
employee_other_income
feat: Income tax slab (#21399)
2020-04-26 17:45:57 +05:30
employee_promotion
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
employee_property_history
…
employee_separation
Feat: Notify by email feature (#18587)
2019-08-05 10:07:05 +05:30
employee_separation_template
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
employee_skill
feat: Add employee training section to the employee skill map
2019-04-18 12:46:33 +05:30
employee_skill_map
fix: Atendance Request, Employee Skill Map, Leave Encashment form UI
2019-12-31 17:18:15 +05:30
employee_tax_exemption_category
refactor: Employee Tax Exemption
2019-04-25 18:53:39 +05:30
employee_tax_exemption_declaration
feat: Income tax slab (#21399)
2020-04-26 17:45:57 +05:30
employee_tax_exemption_declaration_category
fix: a few fixes in payroll
2019-05-01 12:17:47 +05:30
employee_tax_exemption_proof_submission
feat: Income tax slab (#21399)
2020-04-26 17:45:57 +05:30
employee_tax_exemption_proof_submission_detail
refactor: Employee Tax Exemption
2019-04-25 18:53:39 +05:30
employee_tax_exemption_sub_category
refactor: Employee Tax Exemption
2019-04-25 18:53:39 +05:30
employee_training
feat: Add training date field
2019-04-22 23:35:36 +05:30
employee_transfer
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
employee_transfer_property
…
employment_type
perms: fix default import, export perms
2018-08-29 17:10:27 +05:30
expense_claim
feat: Immutable ledger (#18740)
2020-04-30 10:38:58 +05:30
expense_claim_account
…
expense_claim_advance
fix: Multiple fixes based on testing on pre-release branch (#20301)
2020-01-16 13:37:25 +05:30
expense_claim_detail
fix: Expense calim form UI
2019-12-31 17:18:15 +05:30
expense_claim_type
fix: Expense calim form UI
2019-12-31 17:18:15 +05:30
expense_taxes_and_charges
fix: Merge branch 'develop' into healthcare_refactor
2020-03-25 02:08:42 +05:30
holiday
Feat: Monthly attendance sheet Enhancements and UI/UX Improvements (#21331)
2020-05-05 16:08:05 +05:30
holiday_list
Feat: Monthly attendance sheet Enhancements and UI/UX Improvements (#21331)
2020-05-05 16:08:05 +05:30
hr_settings
fix: Changed label for payroll working days based on field
2020-05-11 16:11:43 +05:30
identification_document_type
…
income_tax_slab
fix: Desk links for Income Tax Slab and Employee Other Income (#21510)
2020-04-30 11:03:49 +05:30
income_tax_slab_other_charges
feat: Income tax slab (#21399)
2020-04-26 17:45:57 +05:30
interest
…
job_applicant
fix: merge conflicts
2020-04-07 16:42:50 +05:30
job_applicant_source
Job Applicant Source (#14543)
2018-06-21 10:47:54 +05:30
job_offer
feat: add job applicant's email in job offer (#20153)
2019-12-31 17:09:02 +05:30
job_offer_term
…
job_opening
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
leave_allocation
fix: Procurement tracker report (#21421)
2020-04-26 23:29:13 +05:30
leave_application
fix: duplicate leave expiry creation (#21505)
2020-05-15 11:55:42 +05:30
leave_block_list
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
leave_block_list_allow
…
leave_block_list_date
…
leave_control_panel
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
leave_encashment
Update test_leave_encashment.py
2020-05-05 15:37:17 +05:30
leave_ledger_entry
fix: duplicate leave expiry creation (#21505)
2020-05-15 11:55:42 +05:30
leave_period
fix(compensatory leave request): Create leave ledger entry on submit/cancel (#19476)
2019-12-09 14:27:38 +05:30
leave_policy
feat: add link to policy
2019-06-05 21:16:27 +05:30
leave_policy_detail
…
leave_type
fix: Leave Type form UI
2019-12-31 17:18:15 +05:30
offer_term
…
payroll_employee_detail
fix: modified date (#16520)
2019-01-30 11:46:34 +05:30
payroll_entry
fix: Test for payroll entry
2020-05-05 18:36:12 +05:30
payroll_period
feat: Income tax slab (#21399)
2020-04-26 17:45:57 +05:30
payroll_period_date
…
purpose_of_travel
…
retention_bonus
feat: Employee Incentive and Retention Bonus added in Salary Slip (Additional Salary) (#18647)
2019-09-03 20:45:52 +05:30
salary_component
fix: Consider any kind of exemptions only if tax exemptions are allowed on tax slab (#21474)
2020-04-30 11:02:28 +05:30
salary_detail
patch: to link additional salary with salary slip and leave encashment, incentive with additional salary
2020-05-04 17:07:15 +05:30
salary_slip
fix: Patch and tests
2020-05-05 15:58:52 +05:30
salary_slip_timesheet
fix: Removed precision from multiple doctypes
2019-02-19 08:40:16 +05:30
salary_structure
fix: Permission issue Employee Tax exemption (#21490)
2020-04-29 11:48:41 +05:30
salary_structure_assignment
feat: Income tax slab (#21399)
2020-04-26 17:45:57 +05:30
shift_assignment
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
shift_request
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
shift_type
fix(auto attendance): bug in marking absent (#20759)
2020-02-28 12:27:21 +05:30
skill
feat: Add skill child table to designation doctype
2019-04-16 10:19:53 +05:30
staffing_plan
fix: conflicts
2020-02-27 13:16:53 +05:30
staffing_plan_detail
Enhancement(HR): hiring process (#18129)
2019-07-22 11:47:53 +05:30
taxable_salary_slab
fix: misleading condition example in field options
2019-04-09 18:10:41 +05:30
training_event
fix: requested Changes
2019-06-14 14:10:48 +05:30
training_event_employee
fix: modified date (#16520)
2019-01-30 11:46:34 +05:30
training_feedback
fix(hr): Use event_status instead of status
2019-05-09 19:00:05 +05:30
training_program
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
training_result
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
training_result_employee
fix: modified date (#16520)
2019-01-30 11:46:34 +05:30
travel_itinerary
…
travel_request
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
travel_request_costing
…
upload_attendance
fix: upload attendance (#21620)
2020-05-06 17:06:53 +05:30
vehicle
fix: requested Changes
2019-06-14 14:10:48 +05:30
vehicle_log
fix: Merge branch 'develop' into healthcare_refactor
2020-03-25 02:08:42 +05:30
vehicle_service
fix: Merge branch 'develop' into healthcare_refactor
2020-03-25 02:08:42 +05:30
__init__.py
…