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.

Sign up for GitHub

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

Jump to bottom

fix: Cost center not getting saved in PSOA (backport #41318) #41325

Merged
merged 2 commits into from
May 6, 2024
Merged

fix: Cost center not getting saved in PSOA (backport #41318) #41325

merged 2 commits into from
May 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 4, 2024

This is an automatic backport of pull request #41318 done by [Mergify](https://mergify.com).

@deepeshgarg007 @mergify
fix: Cost center not getting saved in PSOA
fbbc0af 
(cherry picked from commit 58f7039)

# Conflicts:
#	erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
@mergify mergify bot requested a review from deepeshgarg007 as a code owner May 4, 2024 08:27
@mergify mergify bot added the conflicts label May 4, 2024
@mergify mergify bot requested a review from ruthra-kumar as a code owner May 4, 2024 08:27
@mergify Mergify
Copy link
Contributor Author

mergify bot commented May 4, 2024

Cherry-pick of 58f7039 has failed:

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

You are currently cherry-picking commit 58f7039630.
  (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:   erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label May 4, 2024
@deepeshgarg007 deepeshgarg007 merged commit 67954a9 into version-15-hotfix May 6, 2024
11 checks passed
@deepeshgarg007 deepeshgarg007 deleted the mergify/bp/version-15-hotfix/pr-41318 branch May 6, 2024 05:59
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.23.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@ruthra-kumar ruthra-kumar Awaiting requested review from ruthra-kumar ruthra-kumar is a code owner

Assignees

@deepeshgarg007 deepeshgarg007

Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @deepeshgarg007