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: Bank Reconciliation tool fails to match on expense claims with tax #2594

Merged

Conversation

conncampbell
Copy link
Contributor

Issue: #2593.

What This PR Does
This PR addresses the support issue where the bank rec tool doesn't match on expense claims that have tax.

@ruchamahabal ruchamahabal merged commit 508fa38 into frappe:version-15-hotfix Jan 20, 2025
7 checks passed
mergify bot pushed a commit that referenced this pull request Jan 20, 2025
mergify bot pushed a commit that referenced this pull request Jan 20, 2025
…ax (#2594)

(cherry picked from commit 508fa38)

# Conflicts:
#	hrms/hr/utils.py
ruchamahabal pushed a commit that referenced this pull request Jan 20, 2025
frappe-pr-bot pushed a commit that referenced this pull request Jan 23, 2025
## [15.38.1](v15.38.0...v15.38.1) (2025-01-23)

### Bug Fixes

* added check for 0 absent employees ([21db30c](21db30c))
* Bank Reconciliation tool fails to match on expense claims with tax ([#2594](#2594)) ([508fa38](508fa38))
* Bank Reconciliation tool fails with KeyError: 'payment_doctype' ([#2592](#2592)) ([76cbd4a](76cbd4a))
* create single leave ledger entry for encashment if leave is carry forward type. ([48e5128](48e5128))
* **dayjs:** use non esm import for relativeTime ([f70bb03](f70bb03))
* edit test to validate accurate gratuity calculation for employees with experience matching the upper limit of a slab ([2d4d811](2d4d811))
* fetch designation in job applicant from job opening ([8c801ef](8c801ef))
* further slabs need not to be checked if experience is within current slab ([5a0fcbc](5a0fcbc))
* gratuity calculation for 'Sum of all previous slabs' option ([d1329db](d1329db))
* **Income Tax Computation:** include all tax components under Total Tax Deducted (backport [#2607](#2607)) ([#2641](#2641)) ([02432da](02432da))
* mark absense for default shift due to missing checkins when an assigned shift exists for the employee but the absent dates aren't overlapping with it ([5828ccd](5828ccd))
* removed unnecessary filter and checks for assigned shifts, mark_absent_for_dates_with_no_attendance function takes care of which dates to consider for attendance. ([51ce588](51ce588))
* set default value for total_exemption, remove tax exemption elig… (backport [#2640](#2640)) ([#2674](#2674)) ([13d7ec3](13d7ec3))
* set leave encashment amount and payable account in fnf payables (backport [#2646](#2646)) ([#2677](#2677)) ([80494e0](80494e0))
* translation in payroll (backport [#2644](#2644)) ([#2656](#2656)) ([b3a34f8](b3a34f8))
* updated filter to exclude past and current date shift assignment ([6b348db](6b348db))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.38.1 🎉

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants