Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
brotherton-erpnext/erpnext/hr/doctype
History
Nabin Hait 2ef4844a3c
feat: Tax for recurring additional salary (#27459) 
* fix: Logic for tax calculation on recurring additional salary

* fix: Get actual amount always in case of overwritten additional salary even if based on payment days

* feat: Test case added for recurring additional salary

* fix: use query builder to get additional salaries instead of raw SQL

* fix: query formatting and remove trailing spaces

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-10-20 15:50:30 +05:30
..
appointment_letter
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
appointment_letter_content
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
appointment_letter_template
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
appraisal
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
appraisal_goal
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
appraisal_template
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
appraisal_template_goal
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
attendance
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
attendance_request
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
branch
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
compensatory_leave_request
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
daily_work_summary
fix: remove transaction commit from tests
2021-10-12 16:17:15 +05:30
daily_work_summary_group
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
daily_work_summary_group_user
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
department
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
department_approver
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
designation
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
designation_skill
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
driver
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
driving_license_category
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee
feat: Tax for recurring additional salary (#27459)
2021-10-20 15:50:30 +05:30
employee_advance
fix: employee advance return through multiple additional salaries (#27438)
2021-09-14 11:20:15 +05:30
employee_attendance_tool
fix: wrong company selected when marking attendance for all employees (#27685) (#27707)
2021-09-30 12:07:38 +05:30
employee_boarding_activity
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_checkin
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_education
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_external_work_history
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_grade
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_grievance
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_group
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_group_table
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_health_insurance
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_internal_work_history
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_loan
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
employee_onboarding
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
employee_onboarding_template
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_promotion
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_property_history
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_referral
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
employee_separation
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_separation_template
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_skill
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_skill_map
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_training
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_transfer
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employee_transfer_property
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
employment_type
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
expected_skill_set
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
expense_claim
fix(hr): Update expense account after company is updated (#27843)
2021-10-11 11:59:26 +05:30
expense_claim_account
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
expense_claim_advance
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
expense_claim_detail
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
expense_claim_type
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
expense_taxes_and_charges
fix: tax rate being overridden in case of 0.00
2021-09-26 18:31:27 +05:30
full_and_final_asset
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
full_and_final_outstanding_statement
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
full_and_final_statement
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
grievance_type
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
holiday
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
holiday_list
refactor: Clean up mutable defaults and add CI check (#27828)
2021-10-06 16:58:48 +00:00
hr_settings
feat(HR): Some Enhancements and Onboarding (backport #25741) (#27741)
2021-10-02 13:28:39 +05:30
identification_document_type
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
interest
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
interview
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
interview_detail
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
interview_feedback
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
interview_round
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
interview_type
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
interviewer
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
job_applicant
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
job_applicant_source
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
job_offer
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
job_offer_term
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
job_opening
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
leave_allocation
feat(HR): Some Enhancements and Onboarding (backport #25741) (#27741)
2021-10-02 13:28:39 +05:30
leave_application
feat(HR): Some Enhancements and Onboarding (backport #25741) (#27741)
2021-10-02 13:28:39 +05:30
leave_block_list
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
leave_block_list_allow
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
leave_block_list_date
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
leave_control_panel
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
leave_encashment
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
leave_ledger_entry
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
leave_period
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
leave_policy
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
leave_policy_assignment
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
leave_policy_detail
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
leave_type
feat(HR): Some Enhancements and Onboarding (backport #25741) (#27741)
2021-10-02 13:28:39 +05:30
offer_term
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
purpose_of_travel
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
shift_assignment
refactor: Clean up mutable defaults and add CI check (#27828)
2021-10-06 16:58:48 +00:00
shift_request
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
shift_type
fix: exclude inactive employees from auto attendance
2021-10-07 17:12:46 +05:30
skill
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
skill_assessment
feat: Tracking Multi-round interview (#25482) (#27724)
2021-10-01 13:15:40 +05:30
staffing_plan
refactor: Clean up mutable defaults and add CI check (#27828)
2021-10-06 16:58:48 +00:00
staffing_plan_detail
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
training_event
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
training_event_employee
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
training_feedback
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
training_program
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
training_result
Update training_result.js (#27615)
2021-09-21 09:29:15 +05:30
training_result_employee
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
travel_itinerary
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
travel_request
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
travel_request_costing
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
upload_attendance
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
vehicle
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
vehicle_log
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
vehicle_service
chore: Clean up imports (#27302)
2021-09-02 16:44:59 +05:30
__init__.py
moved modules inside erpnext folder
2013-12-11 10:43:52 +05:30