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: set up filters for dimensions (backport #42765) #42766

Merged
merged 4 commits into from
Aug 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 14, 2024

Cost Center - Company filter was missing in all child tables and Asset Capitalization.


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

(cherry picked from commit 2fd8de2)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
(cherry picked from commit 6fa2937)
(cherry picked from commit 0d42793)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
Copy link
Contributor Author

mergify bot commented Aug 14, 2024

Cherry-pick of 2fd8de2 has failed:

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

You are currently cherry-picking commit 2fd8de2f76.
  (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:   erpnext/assets/doctype/asset_capitalization/asset_capitalization.js

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 0d42793 has failed:

On branch mergify/bp/version-14-hotfix/pr-42765
Your branch is ahead of 'origin/version-14-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0d42793397.
  (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:   erpnext/assets/doctype/asset_capitalization/asset_capitalization.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

@khushi8112 khushi8112 merged commit 4951d01 into version-14-hotfix Aug 30, 2024
5 checks passed
@khushi8112 khushi8112 deleted the mergify/bp/version-14-hotfix/pr-42765 branch August 30, 2024 08:13
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.73.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants