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(Employee Advance): selection of currency (backport #1721) #1722

Merged
merged 2 commits into from
Apr 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 29, 2024

Currency in an employee advance is set as the currency of the selected employee's latest salary structure assignment. But if the employee does not have any assignments, it uses the currency of the default company, whereas it should be using the currency of the selected company.


This is an automatic backport of pull request #1721 done by Mergify.

(cherry picked from commit d63ce08)

# Conflicts:
#	hrms/hr/doctype/employee_advance/employee_advance.js
@mergify mergify bot requested a review from ruchamahabal as a code owner April 29, 2024 07:44
@mergify mergify bot added the conflicts label Apr 29, 2024
Copy link
Contributor Author

mergify bot commented Apr 29, 2024

Cherry-pick of d63ce08 has failed:

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

You are currently cherry-picking commit d63ce0872.
  (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/employee_advance/employee_advance.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

@krantheman krantheman merged commit 3d1a6bf into version-14-hotfix Apr 30, 2024
3 of 4 checks passed
@krantheman krantheman deleted the mergify/bp/version-14-hotfix/pr-1721 branch April 30, 2024 14:26
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.27.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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants