fix(Travel Request): get currency from Employee Master's Company (backport #1807) #1819
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
(cherry picked from commit 533b968) # Conflicts: # hrms/hr/doctype/travel_request/travel_request.json # hrms/hr/doctype/travel_request_costing/travel_request_costing.json
|
Cherry-pick of 533b968 has failed: 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
force-pushed
the
mergify/bp/version-15-hotfix/pr-1807
branch
from
2029e4e
to
6606230
Compare
frappe-pr-bot
pushed a commit
that referenced
this pull request
May 30, 2024
# [15.22.0](v15.21.2...v15.22.0) (2024-05-30) ### Bug Fixes * adjust score for autocompletions ([3eddaed](3eddaed)) * formula checkbox label ([daabeb0](daabeb0)) * goal score autocompletion ([3815b58](3815b58)) * show fixed no of digits in location coordinates ([14b8e44](14b8e44)) * skip setting geolocation if tracking is disabled ([c886999](c886999)) * **test:** revert final score changes ([2090bb2](2090bb2)) * **Travel Request:** get currency from Employee Master's Company (backport [#1807](#1807)) ([#1819](#1819)) ([515a44b](515a44b)) ### Features * allow adding formula to calculate final score in appraisal cycle ([76541b6](76541b6)) * **Desk:** fetch geolocation btn in Employee Checkin form ([e49589f](e49589f)) * geolocation in Employee Checkin ([dcb55e5](dcb55e5)) * HR Setting to enable geolocation tracking ([609657f](609657f)) * **PWA:** capture geolocation in checkins ([1132f91](1132f91)) * set desc for formula setting & make formula mandatory if checkbox is enabled ([1929a5d](1929a5d)) * split coordinates field into lat, long and set geolocation on validate ([7aad1ae](7aad1ae))
|
🎉 This PR is included in version 15.22.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
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.
Before: The Currency for Travel Request was inherited from Global Defaults, which is set as USD
After: Gets the Currency from Employee Master's Company
This is an automatic backport of pull request #1807 done by [Mergify](https://mergify.com).