mergify[bot] a739bf90c4 feat: Tax for recurring additional salary (backport #27459) (#28024) ...

* 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>
(cherry picked from commit 2ef4844a3c)

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/salary_slip.py
#	erpnext/payroll/doctype/salary_slip/test_salary_slip.py

* fix: conflicts

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

2021-10-20 16:20:25 +05:30

..

dashboard_chart

Fix: HR and Payroll Dashboard (#22771)

2020-07-23 12:10:48 +05:30

doctype

feat: Tax for recurring additional salary (backport #27459) (#28024)

2021-10-20 16:20:25 +05:30

module_onboarding/payroll

fix: grammatical fixes in module onboarding (#22580)

2020-07-08 14:25:51 +05:30

notification

chore: Cleanup imports (#27320)

2021-09-03 18:57:43 +05:30

number_card

Fix: HR and Payroll Dashboard (#22771)

2020-07-23 12:10:48 +05:30

onboarding_step

fix: Backport missing commits to develop branch (#25305)

2021-04-13 15:46:01 +05:30

payroll_dashboard/payroll

Fix: HR and Payroll Dashboard (#22771)

2020-07-23 12:10:48 +05:30

print_format

fix: change print_format_type from Server to Jinja (#26374) (#26985)

2021-08-17 13:36:08 +00:00

report

chore: Cleanup imports (#27320)

2021-09-03 18:57:43 +05:30

workspace/payroll

feat: update workspace folders

2020-12-03 15:48:57 +05:30

__init__.py

feat: New Payroll module (#21990)

2020-06-19 19:17:57 +05:30