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

fix: Employee filter in YTD and MTD in salary slip (backport #27997) #28018

Merged
merged 1 commit 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 #27997 done by Mergify.


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/

The filter for YTD, MTD etc are based on employee name. This seems like an amateur mistake. It should be based on employee id.

(cherry picked from commit efc292a)
@codecov
Copy link

codecov bot commented Oct 20, 2021

Codecov Report

Merging #28018 (4f2cf43) into develop (9a409df) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop   #28018      +/-   ##
===========================================
- Coverage    54.42%   54.41%   -0.01%     
===========================================
  Files         1255     1255              
  Lines        67831    67831              
===========================================
- Hits         36915    36909       -6     
- Misses       30916    30922       +6     
Impacted Files Coverage Δ
erpnext/payroll/doctype/salary_slip/salary_slip.py 84.22% <ø> (+0.80%) ⬆️
...xt/stock/report/stock_analytics/stock_analytics.py 90.09% <0.00%> (-2.98%) ⬇️
erpnext/stock/report/stock_ageing/stock_ageing.py 88.48% <0.00%> (-2.88%) ⬇️
...ctype/accounting_dimension/accounting_dimension.py 64.34% <0.00%> (-1.56%) ⬇️
...e/period_closing_voucher/period_closing_voucher.py 88.23% <0.00%> (-1.48%) ⬇️
erpnext/portal/utils.py 30.00% <0.00%> (-1.43%) ⬇️
erpnext/accounts/deferred_revenue.py 75.22% <0.00%> (-0.89%) ⬇️
...ice_creation_tool/opening_invoice_creation_tool.py 60.41% <0.00%> (-0.70%) ⬇️
...ype/account/chart_of_accounts/chart_of_accounts.py 77.55% <0.00%> (-0.69%) ⬇️
...rpnext/stock/report/stock_balance/stock_balance.py 78.82% <0.00%> (-0.59%) ⬇️
... and 10 more

@pateljannat pateljannat merged commit 830fa60 into develop Oct 20, 2021
@pateljannat pateljannat deleted the mergify/bp/develop/pr-27997 branch October 20, 2021 07:39
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.

None yet

2 participants