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 entry reference in payroll #2037

Merged
merged 1 commit into from
Aug 5, 2024

Conversation

ruchamahabal
Copy link
Member

Closes #2035

@ruchamahabal ruchamahabal marked this pull request as ready for review August 5, 2024 11:08
@ruchamahabal ruchamahabal merged commit 5fdfbbd into frappe:develop Aug 5, 2024
8 checks passed
mergify bot pushed a commit that referenced this pull request Aug 5, 2024
(cherry picked from commit 5fdfbbd)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/payroll_entry.py
mergify bot pushed a commit that referenced this pull request Aug 5, 2024
ruchamahabal added a commit that referenced this pull request Aug 5, 2024
(cherry picked from commit 5fdfbbd)

Co-authored-by: Rucha Mahabal <[email protected]>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error on payroll entry "make bank entry"
1 participant