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(Travel Request): get currency from Employee Master's Company (backport #1807) #1818

Merged
merged 2 commits into from
May 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 28, 2024

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

Screenshot 2024-05-24 at 12 18 44 PM Screenshot 2024-05-24 at 12 19 00 PM
This is an automatic backport of pull request #1807 done by [Mergify](https://mergify.com).

(cherry picked from commit 533b968)

# Conflicts:
#	hrms/hr/doctype/travel_request/travel_request.json
#	hrms/hr/doctype/travel_request_costing/travel_request_costing.json
@mergify mergify bot added the conflicts label May 28, 2024
@mergify mergify bot requested a review from ruchamahabal as a code owner May 28, 2024 09:51
Copy link
Contributor Author

mergify bot commented May 28, 2024

Cherry-pick of 533b968 has failed:

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

You are currently cherry-picking commit 533b96873.
  (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/doctype/travel_request/travel_request.json
	both modified:   hrms/hr/doctype/travel_request_costing/travel_request_costing.json

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 ca857ab into version-14-hotfix May 29, 2024
6 of 7 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1807 branch May 29, 2024 10:40
frappe-pr-bot pushed a commit that referenced this pull request May 30, 2024
## [14.28.3](v14.28.2...v14.28.3) (2024-05-30)

### Bug Fixes

* **Travel Request:** get currency from Employee Master's Company (backport [#1807](#1807)) ([#1818](#1818)) ([ca857ab](ca857ab))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.28.3 🎉

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