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: Remove current fiscal year from Global Defaults (backport #35960) #36153

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 16, 2023

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

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

You are currently cherry-picking commit 6270607c6d.
  (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/fiscal_year/fiscal_year.js
	modified:   erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
	modified:   erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js
	modified:   erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py
	modified:   erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py
	modified:   erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js
	modified:   erpnext/accounts/report/profitability_analysis/profitability_analysis.js
	modified:   erpnext/accounts/report/trial_balance/trial_balance.js
	modified:   erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
	modified:   erpnext/accounts/utils.py
	modified:   erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
	modified:   erpnext/hooks.py
	modified:   erpnext/manufacturing/report/job_card_summary/job_card_summary.js
	modified:   erpnext/public/js/financial_statements.js
	modified:   erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js
	modified:   erpnext/regional/report/irs_1099/irs_1099.js
	modified:   erpnext/setup/doctype/global_defaults/global_defaults.json
	modified:   erpnext/setup/doctype/global_defaults/global_defaults.py
	modified:   erpnext/setup/setup_wizard/operations/install_fixtures.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/fiscal_year/fiscal_year.py
	both modified:   erpnext/patches.txt
	both modified:   erpnext/public/js/utils.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

* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser

(cherry picked from commit 6270607)

# Conflicts:
#	erpnext/accounts/doctype/fiscal_year/fiscal_year.py
#	erpnext/patches.txt
#	erpnext/public/js/utils.js
@deepeshgarg007 deepeshgarg007 merged commit b877fa6 into version-14-hotfix Jul 17, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-35960 branch July 17, 2023 06:23
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.31.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@bosue bosue mentioned this pull request Jul 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 16, 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.

2 participants