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.

Sign up for GitHub

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

Jump to bottom

feat: utility to repost accounting ledgers without cancellation (backport #36469) #36672

Merged
merged 2 commits into from
Aug 19, 2023
Merged

feat: utility to repost accounting ledgers without cancellation (backport #36469) #36672

merged 2 commits into from
Aug 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2023

This is an automatic backport of pull request #36469 done by Mergify.
Cherry-pick of e64b004 has failed:

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

You are currently cherry-picking commit e64b004eca.
  (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/journal_entry/journal_entry.py
	modified:   erpnext/accounts/doctype/payment_entry/payment_entry.js
	modified:   erpnext/accounts/doctype/payment_entry/payment_entry.py
	modified:   erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
	modified:   erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
	new file:   erpnext/accounts/doctype/repost_accounting_ledger/__init__.py
	new file:   erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.html
	new file:   erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.js
	new file:   erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
	new file:   erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py
	new file:   erpnext/accounts/doctype/repost_accounting_ledger/test_repost_accounting_ledger.py
	new file:   erpnext/accounts/doctype/repost_accounting_ledger_items/__init__.py
	new file:   erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json
	new file:   erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.py
	modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.js
	modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	modified:   erpnext/accounts/test/accounts_mixin.py

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

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

@ruthra-kumar @mergify
feat: utility to repost accounting ledgers without cancellation (#36469)
f8d6fe6 
* feat: introduce doctypes for repost

* refactor: basic filters and validations

* chore: basic validations

* chore: added barebones function to generate ledger entries

* chore: repost on submit

* chore: repost in background

* chore: include payment entry and journal entry

* chore: ignore repost doc on cancel

* chore: preview method

* chore: rudimentary form of preview

* refactor: preview template

* refactor: basic background colors to differentiate old and new

* chore: remove commented code

* test: basic functionality

* chore: fix conflict

* chore: prevent repost on invoices with deferred accounting

* refactor(test): rename and test basic validations and methods

* refactor(test): test all validations

* fix(test): use proper name account name

* refactor(test): fix failing test case

* refactor(test): clear old entries

* refactor(test): simpler logic to clear old records

* refactor(test): make use of deletion flag

* refactor(test): split into multiple test cases

(cherry picked from commit e64b004)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.js
@mergify mergify bot added the conflicts label Aug 16, 2023
@ruthra-kumar ruthra-kumar merged commit e8f1c82 into version-14-hotfix Aug 19, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36469 branch August 19, 2023 14:25
@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.
Reviewers

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@ruthra-kumar ruthra-kumar Awaiting requested review from ruthra-kumar ruthra-kumar is a code owner

Assignees

@ruthra-kumar ruthra-kumar

Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @ruthra-kumar