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: shipping rule must match the company (backport #43283) #43345

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 23, 2024

We used to allow selecting Shipping Rules that belong to a different Company, which lead to errors due to using foreign income accounts. Now the Shipping Rule must belong to the same company as the corresponding sales transaction.


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

(cherry picked from commit df8f408)

# Conflicts:
#	erpnext/public/js/utils/sales_common.js
@mergify mergify bot added the conflicts label Sep 23, 2024
Copy link
Contributor Author

mergify bot commented Sep 23, 2024

Cherry-pick of df8f408 has failed:

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

You are currently cherry-picking commit df8f4086f6.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   erpnext/public/js/utils/sales_common.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

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