frappe icon indicating copy to clipboard operation
frappe copied to clipboard

refactor!: prepared report (backport #18940)

Open mergify[bot] opened this issue 2 years ago • 3 comments

This is an automatic backport of pull request #18940 done by Mergify. Cherry-pick of 4fe8eadf5e503529ed6540ee54b6c9275e83a378 has failed:

On branch mergify/bp/version-14-hotfix/pr-18940
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 4fe8eadf5e.
  (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:   frappe/core/doctype/prepared_report/prepared_report.json
	modified:   frappe/core/doctype/prepared_report/prepared_report.py
	deleted:    frappe/core/doctype/prepared_report/prepared_report_list.js
	modified:   frappe/core/doctype/prepared_report/test_prepared_report.py
	modified:   frappe/core/doctype/report/report.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/query_report.py

Cherry-pick of 18d48ddeb8b916f22c663811ffc6ef40ecccb04b has failed:

On branch mergify/bp/version-14-hotfix/pr-18940
Your branch is ahead of 'origin/version-14-hotfix' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 18d48ddeb8.
  (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:   frappe/core/doctype/prepared_report/prepared_report.json
	modified:   frappe/core/doctype/prepared_report/prepared_report.py
	modified:   frappe/core/doctype/report/report.json
	modified:   frappe/core/doctype/report/report.py
	modified:   frappe/core/doctype/role_permission_for_page_and_report/role_permission_for_page_and_report.py
	modified:   frappe/core/doctype/system_settings/system_settings.json
	modified:   frappe/hooks.py
	modified:   frappe/public/js/frappe/views/reports/query_report.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/log_settings/log_settings.py
	both modified:   frappe/desk/query_report.py

Cherry-pick of a69c82e06c8737a64024634522290cae1edc61b9 has failed:

On branch mergify/bp/version-14-hotfix/pr-18940
Your branch is ahead of 'origin/version-14-hotfix' by 12 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a69c82e06c.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/query_report.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 0370c80e41e4a1e69f42b29f8978047dee6dfa03 has failed:

Cherry-pick of 1a5019432da293a5bc92e9b0251e5a5cbff66212 has failed:

On branch mergify/bp/version-14-hotfix/pr-18940
Your branch is ahead of 'origin/version-14-hotfix' by 16 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1a5019432d.
  (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:   frappe/core/doctype/role_permission_for_page_and_report/role_permission_for_page_and_report.py
	new file:   frappe/core/doctype/role_permission_for_page_and_report/test_role_permission_for_page_and_report.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/role_permission_for_page_and_report/role_permission_for_page_and_report.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

mergify[bot] avatar Jan 11 '23 09:01 mergify[bot]

TODO:

  • [ ] resolve conflicts
  • [ ] revert breaking changes

phot0n avatar Jan 11 '23 17:01 phot0n

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

stale[bot] avatar Jan 27 '23 20:01 stale[bot]

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

stale[bot] avatar Feb 27 '23 05:02 stale[bot]

:tada: This PR is included in version 14.36.0 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

frappe-pr-bot avatar May 09 '23 15:05 frappe-pr-bot