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.

Sign up for GitHub

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

Jump to bottom

fix: filter in reports (backport #1987) #2044

Merged
merged 2 commits into from
Aug 6, 2024
Merged

fix: filter in reports (backport #1987) #2044

merged 2 commits into from
Aug 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 6, 2024

Version: dev and 15

Before:

image

After:

image

This is an automatic backport of pull request #1987 done by [Mergify](https://mergify.com).

@Nihantra-Patel @mergify
fix: filter in reports (#1987)
6aef4af 
* fix: filter in reports

* fix: filter in reports --prettier

(cherry picked from commit 559ef06)

# Conflicts:
#	hrms/public/js/hrms.bundle.js
@mergify mergify bot requested a review from ruchamahabal as a code owner August 6, 2024 07:49
@mergify mergify bot added the conflicts label Aug 6, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Aug 6, 2024

Cherry-pick of 559ef06 has failed:

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

You are currently cherry-picking commit 559ef067a.
  (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:   hrms/payroll/report/income_tax_deductions/income_tax_deductions.js
	modified:   hrms/payroll/report/professional_tax_deductions/professional_tax_deductions.js
	modified:   hrms/payroll/report/provident_fund_deductions/provident_fund_deductions.js
	modified:   hrms/payroll/report/salary_payments_via_ecs/salary_payments_via_ecs.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/public/js/hrms.bundle.js

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

@ruchamahabal ruchamahabal merged commit adeb482 into version-14-hotfix Aug 6, 2024
4 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1987 branch August 6, 2024 07:55
frappe-pr-bot pushed a commit that referenced this pull request Aug 7, 2024
@frappe-bot
chore(release): Bumped to Version 14.29.3
3f8926c 
## [14.29.3](v14.29.2...v14.29.3) (2024-08-07)

### Bug Fixes

* concurrency issue leading to duplicate attendance insertion ([#2041](#2041)) ([#2042](#2042)) ([3411d7a](3411d7a))
* filter and bold issue in Salary Payments Based On Payment Mode (backport [#2025](#2025)) ([#2048](#2048)) ([0913976](0913976))
* filter in reports (backport [#1987](#1987)) ([#2044](#2044)) ([adeb482](adeb482))
* query in Provident Fund and Professional Tax Deductions reports (backport [#2026](#2026)) ([#2033](#2033)) ([617de87](617de87))
* rendering the email template subject in leave notification (backport [#2027](#2027)) ([#2046](#2046)) ([1e576fc](1e576fc))
* wrong compute of CTC on salary slip, if employee relieving date before end of payroll period. (backport [#1779](#1779)) ([#2053](#2053)) ([f8837e4](f8837e4))
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.29.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruchamahabal ruchamahabal ruchamahabal left review comments

Assignees

@Nihantra-Patel Nihantra-Patel

Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@frappe-pr-bot @ruchamahabal @Nihantra-Patel