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: COGS account in purchase receipt (backport #26735) #28177

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 1, 2021

This is an automatic backport of pull request #26735 done by Mergify.
Cherry-pick of 2a14f25 has failed:

On branch mergify/bp/version-13-pre-release/pr-26735
Your branch is up to date with 'origin/version-13-pre-release'.

You are currently cherry-picking commit 2a14f255cf.
  (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/pricing_rule/test_pricing_rule.py
	modified:   erpnext/accounts/utils.py
	modified:   erpnext/controllers/accounts_controller.py
	modified:   erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

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.io/

(cherry picked from commit 2a14f25)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@deepeshgarg007 deepeshgarg007 merged commit 982960f into version-13-pre-release Nov 1, 2021
@mergify mergify bot deleted the mergify/bp/version-13-pre-release/pr-26735 branch November 1, 2021 11:21
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
…-release/pr-26735

fix: COGS account in purchase receipt (backport frappe#26735)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 9, 2025
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