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: make reposting implicit (backport #42294) #42337

Merged
merged 5 commits into from
Jul 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 15, 2024

Updating accounting dimensions in Sales/Purchase Invoice and Journal Entries will immediately Repost ledger entries upon update.


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

(cherry picked from commit 722ef92)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.py
Reposting happens implicitly upon 'Update After Submit'

(cherry picked from commit 8f135e9)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/test_journal_entry.py
(cherry picked from commit 794a62a)
Copy link
Contributor Author

mergify bot commented Jul 15, 2024

Cherry-pick of 722ef92 has failed:

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

You are currently cherry-picking commit 722ef92324.
  (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/purchase_invoice/purchase_invoice.py
	modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.py

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

Cherry-pick of 8f135e9 has failed:

On branch mergify/bp/version-14-hotfix/pr-42294
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 8f135e9859.
  (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/purchase_invoice/test_purchase_invoice.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/journal_entry/test_journal_entry.py

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

@ruthra-kumar ruthra-kumar merged commit 2ce7300 into version-14-hotfix Jul 15, 2024
10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-42294 branch July 15, 2024 10:11
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.70.11 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants