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

refactor: Loosen account currency validation on groups (backport #42774) #42782

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2024

Loosen the accounts validation to allow foreign currency default accounts for receivable / payable accounts and advances in Customer / Supplier Group.

Both the accounts should be of the same currency. That validation stays.


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

(cherry picked from commit 066e935)

# Conflicts:
#	erpnext/setup/doctype/customer_group/customer_group.py
(cherry picked from commit 164498b)

# Conflicts:
#	erpnext/setup/doctype/supplier_group/supplier_group.py
@mergify mergify bot added the conflicts label Aug 16, 2024
Copy link
Contributor Author

mergify bot commented Aug 16, 2024

Cherry-pick of 066e935 has failed:

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

You are currently cherry-picking commit 066e935892.
  (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/setup/doctype/customer_group/customer_group.py

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

Cherry-pick of 164498b has failed:

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

You are currently cherry-picking commit 164498bafb.
  (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/setup/doctype/supplier_group/supplier_group.py

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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Aug 16, 2024
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-42774 branch August 16, 2024 04:36
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 2, 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