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

chore: Add accounting dimensions to Sales Order Item table (backport #37550) #37555

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 17, 2023

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

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

You are currently cherry-picking commit e31db18912.
  (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/accounting_dimension/accounting_dimension.py
	modified:   erpnext/hooks.py
	new file:   erpnext/patches/v14_0/create_accounting_dimensions_in_sales_order_item.py
	modified:   erpnext/selling/doctype/sales_order_item/sales_order_item.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

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

(cherry picked from commit e31db18)

# Conflicts:
#	erpnext/patches.txt
@mergify mergify bot added the conflicts label Oct 17, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Oct 17, 2023
@deepeshgarg007 deepeshgarg007 merged commit 837a6b5 into version-14-hotfix Oct 18, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-37550 branch October 18, 2023 11:39
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant