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(Leave Balance): Add context to translation for "Left" (Employee) (backport #1683) #1686

Merged
merged 2 commits into from
Apr 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 19, 2024


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

…1683)

(cherry picked from commit 97f393e)

# Conflicts:
#	hrms/hr/report/employee_leave_balance/employee_leave_balance.js
@mergify mergify bot added the conflicts label Apr 19, 2024
@mergify mergify bot requested a review from ruchamahabal as a code owner April 19, 2024 04:00
Copy link
Contributor Author

mergify bot commented Apr 19, 2024

Cherry-pick of 97f393e has failed:

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

You are currently cherry-picking commit 97f393e8b.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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 5b5f3c2 into version-15-hotfix Apr 19, 2024
4 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1683 branch April 19, 2024 04:07
frappe-pr-bot pushed a commit that referenced this pull request Apr 24, 2024
# [15.20.0](v15.19.0...v15.20.0) (2024-04-24)

### Bug Fixes

* adjust grid cols and add connection to Journal Entry ([58fd967](58fd967))
* **Job Applicant:** Translate dialog label (backport [#1682](#1682)) ([#1688](#1688)) ([6ced503](6ced503))
* **Leave Balance:** Add context to translation for "Left" (Employee) (backport [#1683](#1683)) ([#1686](#1686)) ([5b5f3c2](5b5f3c2))
* **PWA:** allow selecting accounting dimensions in Expense Claim (backport [#1704](#1704)) ([#1705](#1705)) ([2407fc9](2407fc9))

### Features

* add remarks to JV for asset cost recovery ([714f966](714f966))
* **FnF:** Option to recover asset costs instead of returning ([16a03e3](16a03e3))
* map asset recovery in Journal Entry ([085d9cd](085d9cd))
* set actual asset cost ([f9481c0](f9481c0))
* set totals on server-side + consider asset recovery in receivables ([1adc2dc](1adc2dc))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.20.0 🎉

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

Successfully merging this pull request may close these issues.

3 participants