Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Oct 20, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 20, 2021

This is an automatic backport of pull request #27459 done by Mergify.
Cherry-pick of 2ef4844 has failed:

On branch mergify/bp/version-13-hotfix/pr-27459
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit 2ef4844a3c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/hr/doctype/employee/test_employee.py
	modified:   erpnext/payroll/doctype/additional_salary/additional_salary.py
	modified:   erpnext/payroll/doctype/salary_detail/salary_detail.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/payroll/doctype/salary_slip/salary_slip.py
	both modified:   erpnext/payroll/doctype/salary_slip/test_salary_slip.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* 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 2ef4844)

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/salary_slip.py
#	erpnext/payroll/doctype/salary_slip/test_salary_slip.py
@codecov
Copy link

codecov bot commented Oct 20, 2021

Codecov Report

Merging #28024 (2ef4844) into version-13-hotfix (cc143bc) will decrease coverage by 0.25%.
The diff coverage is 35.76%.

❗ Current head 2ef4844 differs from pull request most recent head 03e6737. Consider uploading reports for the commit 03e6737 to get more accurate results

@@                  Coverage Diff                  @@
##           version-13-hotfix   #28024      +/-   ##
=====================================================
- Coverage              54.62%   54.36%   -0.26%     
=====================================================
  Files                   1334     1255      -79     
  Lines                  70756    67845    -2911     
=====================================================
- Hits                   38650    36886    -1764     
+ Misses                 32106    30959    -1147     
Impacted Files Coverage Δ
...of_accounts_importer/chart_of_accounts_importer.py 0.00% <0.00%> (ø)
...doctype/loyalty_point_entry/loyalty_point_entry.py 92.30% <0.00%> (ø)
erpnext/accounts/general_ledger.py 95.93% <ø> (ø)
erpnext/accounts/report/cash_flow/cash_flow.py 0.00% <0.00%> (ø)
...cial_statement/consolidated_financial_statement.py 0.00% <0.00%> (ø)
...t/accounts/report/general_ledger/general_ledger.py 21.32% <0.00%> (ø)
erpnext/controllers/queries.py 60.32% <ø> (+1.79%) ⬆️
..._integrations/doctype/taxjar_nexus/taxjar_nexus.py 0.00% <0.00%> (ø)
erpnext/erpnext_integrations/taxjar_integration.py 18.75% <17.64%> (-0.89%) ⬇️
erpnext/accounts/utils.py 59.38% <21.42%> (-0.33%) ⬇️
... and 143 more

@ruchamahabal ruchamahabal merged commit a739bf9 into version-13-hotfix Oct 20, 2021
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-27459 branch October 20, 2021 10:51
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
…appe#28024)

* feat: Tax for recurring additional salary (frappe#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 2ef4844)

# 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants