fix: filter in reports #1987
Merged
fix: filter in reports #1987
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ruchamahabal
approved these changes
Aug 6, 2024
mergify bot
pushed a commit
that referenced
this pull request
Aug 6, 2024
* fix: filter in reports * fix: filter in reports --prettier (cherry picked from commit 559ef06) # Conflicts: # hrms/public/js/hrms.bundle.js
mergify bot
pushed a commit
that referenced
this pull request
Aug 6, 2024
* fix: filter in reports * fix: filter in reports --prettier (cherry picked from commit 559ef06)
This was referenced Aug 6, 2024
ruchamahabal
pushed a commit
that referenced
this pull request
Aug 6, 2024
* fix: filter in reports * fix: filter in reports --prettier (cherry picked from commit 559ef06) Co-authored-by: Nihantra C. Patel <[email protected]>
ruchamahabal
added a commit
that referenced
this pull request
Aug 6, 2024
* fix: filter in reports (#1987) * fix: filter in reports * fix: filter in reports --prettier (cherry picked from commit 559ef06) # Conflicts: # hrms/public/js/hrms.bundle.js * chore: fix conflicts --------- Co-authored-by: Nihantra C. Patel <[email protected]> Co-authored-by: Rucha Mahabal <[email protected]>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Aug 7, 2024
## [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
pushed a commit
that referenced
this pull request
Aug 7, 2024
## [15.25.2](v15.25.1...v15.25.2) (2024-08-07) ### Bug Fixes * bank entry reference in payroll (backport [#2037](#2037)) ([#2039](#2039)) ([432f977](432f977)) * concurrency issue leading to duplicate attendance insertion ([#2041](#2041)) ([#2043](#2043)) ([957537c](957537c)) * filter and bold issue in Salary Payments Based On Payment Mode (backport [#2025](#2025)) ([#2049](#2049)) ([46ed7be](46ed7be)) * filter in reports (backport [#1987](#1987)) ([#2045](#2045)) ([ac35324](ac35324)) * query in Provident Fund and Professional Tax Deductions reports (backport [#2026](#2026)) ([#2034](#2034)) ([8d056db](8d056db)) * rendering the email template subject in leave notification (backport [#2027](#2027)) ([#2047](#2047)) ([cd1bdc0](cd1bdc0)) * wrong compute of CTC on salary slip, if employee relieving date before end of payroll period. (backport [#1779](#1779)) ([#2054](#2054)) ([ddf4cdb](ddf4cdb)) * wrong translation of "Manual" ([1bdc836](1bdc836))
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Version: dev and 15
Before:
After: