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: total_loan_repayment field in payroll entry #2324

Merged
merged 5 commits into from
Oct 23, 2024

Conversation

Nihantra-Patel
Copy link
Contributor

@Nihantra-Patel Nihantra-Patel commented Oct 23, 2024

fixes: #2323

Introduced via #2283

@ruchamahabal
Copy link
Member

ruchamahabal commented Oct 23, 2024

Unrelated test failure

Fixed via frappe/frappe#28252

@ruchamahabal ruchamahabal merged commit 8c05286 into frappe:develop Oct 23, 2024
5 of 7 checks passed
mergify bot pushed a commit that referenced this pull request Oct 23, 2024
ruchamahabal pushed a commit that referenced this pull request Oct 23, 2024
frappe-pr-bot pushed a commit that referenced this pull request Oct 23, 2024
# [15.33.0](v15.32.2...v15.33.0) (2024-10-23)

### Bug Fixes

* **Employee Checkin:** fetch geolocation ([749ccf4](749ccf4))
* **Leave Policy Assignment:** calculation of months passed ([3c4eb4c](3c4eb4c))
* **Payroll CTC Calculation:** compute future non taxable earnings with full payment days ([5144552](5144552))
* **Shift Location:** fetch geolocation ([a17eba4](a17eba4))
* show opening balances section if employee joined after payroll period ([eaa753a](eaa753a))
* show social login icon ([5dcc21f](5dcc21f))
* total_loan_repayment field in payroll entry (backport [#2324](#2324)) ([#2326](#2326)) ([d2a693f](d2a693f))

### Features

* **PWA:** Allow login using OAuth ([5755c6c](5755c6c))
* unlink payment on cancelation of employee advance ([dfb3054](dfb3054))
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.

1054, "Unknown column 'tabSalary Slip.total_loan_repayment' in 'field list'"
2 participants