brotherton-erpnext/erpnext/payroll/doctype
Anurag Mishra adfdc71844
fix: Tax calculation for Recurring additional salary (#24206)
* fix: Tax calculation for Recurring additional salary

* fix: conflicts
2021-07-14 09:59:41 +05:30
..
additional_salary fix: Tax calculation for Recurring additional salary (#24206) 2021-07-14 09:59:41 +05:30
employee_benefit_application fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
employee_benefit_application_detail feat: multi-currency payroll (#23519) 2020-12-01 09:11:05 +05:30
employee_benefit_claim fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
employee_incentive fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
employee_other_income fix: patch check_is_income_tax_component (#22371) 2020-06-22 12:17:29 +05:30
employee_tax_exemption_category fix: patch check_is_income_tax_component (#22371) 2020-06-22 12:17:29 +05:30
employee_tax_exemption_declaration fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
employee_tax_exemption_declaration_category feat: multi-currency payroll (#23519) 2020-12-01 09:11:05 +05:30
employee_tax_exemption_proof_submission fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
employee_tax_exemption_proof_submission_detail feat: multi-currency payroll (#23519) 2020-12-01 09:11:05 +05:30
employee_tax_exemption_sub_category fix: patch check_is_income_tax_component (#22371) 2020-06-22 12:17:29 +05:30
gratuity test: fix salary component not found; other optimisation (#24920) 2021-03-17 19:54:08 +05:30
gratuity_applicable_component Feat: gratuity 2020-12-23 18:07:05 +05:30
gratuity_rule feat: Added Form dashboard 2020-12-23 18:07:54 +05:30
gratuity_rule_slab fix: Some enhancements and better validation 2020-12-23 18:07:06 +05:30
income_tax_slab fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
income_tax_slab_other_charges feat: multi-currency payroll (#23519) 2020-12-01 09:11:05 +05:30
payroll_employee_detail fix: allow addition and removal of employee in payroll Entry 2020-12-23 12:59:48 +05:30
payroll_entry fix: Removed un-used flag 2021-07-08 13:06:04 +05:30
payroll_period Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
payroll_period_date fix: patch check_is_income_tax_component (#22371) 2020-06-22 12:17:29 +05:30
payroll_settings perf: Performance enhancement on setup wizard (#25605) 2021-05-06 19:13:54 +05:30
retention_bonus feat: add Inactive status to Employee 2021-06-12 13:36:47 +05:30
salary_component feat: multi-currency payroll (#23519) 2020-12-01 09:11:05 +05:30
salary_detail fix: Tax calculation for Recurring additional salary (#24206) 2021-07-14 09:59:41 +05:30
salary_slip fix: Tax calculation for Recurring additional salary (#24206) 2021-07-14 09:59:41 +05:30
salary_slip_leave feat: Additon of leave details in Salary Slip (#24674) 2021-03-02 18:38:31 +05:30
salary_slip_timesheet fix: patch check_is_income_tax_component (#22371) 2020-06-22 12:17:29 +05:30
salary_structure fix: Added Company filters for Loan (#26294) 2021-07-12 13:01:31 +05:30
salary_structure_assignment fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
taxable_salary_slab feat: multi-currency payroll (#23519) 2020-12-01 09:11:05 +05:30
__init__.py feat: New Payroll module (#21990) 2020-06-19 19:17:57 +05:30