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: company wise deferred accounting fields in item (backport #37023) #37114

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 16, 2023

This is an automatic backport of pull request #37023 done by Mergify.
Cherry-pick of 099468e has failed:

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

You are currently cherry-picking commit 099468e3cf.
  (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
	modified:   erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
	modified:   erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py
	modified:   erpnext/patches/v14_0/delete_healthcare_doctypes.py
	new file:   erpnext/patches/v14_0/migrate_deferred_accounts_to_item_defaults.py
	modified:   erpnext/stock/doctype/item/item.js
	modified:   erpnext/stock/doctype/item_default/item_default.json
	modified:   erpnext/stock/get_item_details.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt
	both modified:   erpnext/patches/v14_0/delete_education_doctypes.py
	both modified:   erpnext/stock/doctype/item/item.json

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

* fix: move deferred accounts in accounting section

* fix: move deferred check boxes in item accounting

* fix: show company wise acc in filters

* fix: fetch item deferred account from child table

* fix: tests using deferred acc

* refactor: use cached value

* fix: cached value call

* feat: patch to migrate deferred acc

* fix: hardcode education module doctypes in patch

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 099468e)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/patches/v14_0/delete_education_doctypes.py
#	erpnext/stock/doctype/item/item.json
@deepeshgarg007 deepeshgarg007 merged commit 13aaff3 into version-14-hotfix Sep 18, 2023
9 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-37023 branch September 18, 2023 04:27
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.40.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 Jan 29, 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