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(Expense Claim): Pass company to properly pick currency for each record (backport #1335) #1336

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 19, 2024

This is an automatic backport of pull request #1335 done by Mergify.
Cherry-pick of f7c8f64 has failed:

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

You are currently cherry-picking commit f7c8f64e2.
  (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 added:      hrms/hr/doctype/expense_claim/expense_claim_list.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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…ecord (#1335)

(cherry picked from commit f7c8f64)

# Conflicts:
#	hrms/hr/doctype/expense_claim/expense_claim_list.js
@mergify mergify bot requested a review from ruchamahabal as a code owner January 19, 2024 11:40
@mergify mergify bot added the conflicts label Jan 19, 2024
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1335 branch January 19, 2024 11:46
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.

2 participants