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

feat: Config to enable immutable ledger (backport #41429) #41438

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

no-docs


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

(cherry picked from commit d56f52b)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/general_ledger.py
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of d56f52b has failed:

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

You are currently cherry-picking commit d56f52b0ba.
  (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/accounts_settings/accounts_settings.js
	modified:   erpnext/accounts/doctype/accounts_settings/accounts_settings.py

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

@github-actions github-actions bot added accounts needs-tests This PR needs automated unit-tests. labels May 13, 2024
@deepeshgarg007
Copy link
Member

@Mergifyio backport version-15

Copy link
Contributor Author

mergify bot commented May 17, 2024

backport version-15

✅ Backports have been created

@deepeshgarg007 deepeshgarg007 merged commit e1f8148 into version-15-hotfix May 17, 2024
11 checks passed
@deepeshgarg007 deepeshgarg007 deleted the mergify/bp/version-15-hotfix/pr-41429 branch May 17, 2024 03:41
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.25.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
accounts conflicts needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants