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): update ledger entries after updating cost center (backport #2276) #2295

Merged
merged 2 commits into from
Oct 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 16, 2024

Continuation of #2267


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

(cherry picked from commit 3d6d716)

# Conflicts:
#	hrms/hr/doctype/expense_claim_detail/expense_claim_detail.json
#	hrms/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json
Copy link
Contributor Author

mergify bot commented Oct 16, 2024

Cherry-pick of 3d6d716 has failed:

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

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

Changes to be committed:
	modified:   hrms/hr/doctype/expense_claim/expense_claim.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/expense_claim_detail/expense_claim_detail.json
	both modified:   hrms/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json

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 5f3220a into version-15-hotfix Oct 16, 2024
7 checks passed
@krantheman krantheman deleted the mergify/bp/version-15-hotfix/pr-2276 branch October 16, 2024 08:55
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.32.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.

2 participants