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: make offsetting entry for acc dimensions in general ledger (backport #36149) #36707

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 18, 2023

This is an automatic backport of pull request #36149 done by Mergify.
Cherry-pick of 77deac4 has failed:

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

You are currently cherry-picking commit 77deac4fb9.
  (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/accounts/doctype/purchase_invoice/test_purchase_invoice.py

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

Cherry-pick of ecca9cb has failed:

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

You are currently cherry-picking commit ecca9cb023.
  (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.js
	modified:   erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
	modified:   erpnext/accounts/general_ledger.py
	modified:   erpnext/accounts/report/trial_balance/test_trial_balance.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.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.com

GursheenK and others added 14 commits August 18, 2023 07:08
(cherry picked from commit 77deac4)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
(cherry picked from commit 4f9242d)
(cherry picked from commit ecca9cb)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@deepeshgarg007 deepeshgarg007 merged commit d082e68 into version-14-hotfix Aug 21, 2023
9 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36149 branch August 21, 2023 12:33
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.36.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 5, 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.

3 participants