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: attribute error on export of reports with additional columns (backport #19105) #19119

Merged
merged 1 commit into from Dec 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 5, 2022

This is an automatic backport of pull request #19105 done by Mergify.
Cherry-pick of 90a4c93 has failed:

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

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

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 mergify bot requested a review from a team as a code owner December 5, 2022 11:41
@mergify mergify bot requested review from shariquerik and removed request for a team December 5, 2022 11:41
@mergify mergify bot added the conflicts label Dec 5, 2022
@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-13-hotfix/pr-19105 branch from 52e688f to f2ec2f0 Compare December 6, 2022 04:43
@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-13-hotfix/pr-19105 branch from f2ec2f0 to de095de Compare December 6, 2022 04:44
@ruthra-kumar
Copy link
Member

@phot0n Can you merge this.

@phot0n phot0n merged commit da28290 into version-13-hotfix Dec 8, 2022
@phot0n phot0n deleted the mergify/bp/version-13-hotfix/pr-19105 branch December 8, 2022 08:02
frappe-pr-bot pushed a commit that referenced this pull request Dec 13, 2022
# [13.46.0](v13.45.3...v13.46.0) (2022-12-13)

### Bug Fixes

* attribute error on export of reports with additional columns ([#19105](#19105)) ([#19119](#19119)) ([da28290](da28290))
* do not rename select field options and values on doctype rename ([#19223](#19223)) ([#19225](#19225)) ([47f5fd0](47f5fd0))
* **docshare:** return None if share_name and value are None ([#19187](#19187)) ([#19188](#19188)) ([4e2620a](4e2620a))
* log unknown usernames too for failed attempts ([#19199](#19199)) ([#19200](#19200)) ([a75fa10](a75fa10))
* only make fetch_from field read only if no input (backport [#19192](#19192)) ([#19194](#19194)) ([994c1ed](994c1ed))
* reload shared dialog upon checking any perm (backport [#19196](#19196)) ([#19197](#19197)) ([fd44b34](fd44b34))
* set-config -g ([#19217](#19217)) ([#19218](#19218)) ([458707e](458707e))
* stabilize shared with dialog (backport [#19170](#19170)) ([#19185](#19185)) ([4f9d755](4f9d755))
* unscrub and translate field names in tooltip explaining fetch from (backport [#19143](#19143)) ([#19173](#19173)) ([fc430d1](fc430d1))
* **UX:** forget password shows error on wrong email ([#19235](#19235)) ([#19239](#19239)) ([5257ca7](5257ca7))
* workflow icon not visible in mobile view ([dcb3933](dcb3933))

### Features

* allow user to pick all columns ([#19236](#19236)) ([927b264](927b264))
* finer frappe Recorder control with decorator (backport [#19220](#19220)) ([#19221](#19221)) ([3b18e7e](3b18e7e))
* inter-process file locks ([#19133](#19133)) ([#19145](#19145)) ([b34e8ce](b34e8ce))

### Performance Improvements

* remove order_by from linked_with checks ([#19229](#19229)) ([#19242](#19242)) ([c2cde0c](c2cde0c))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.46.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 Dec 28, 2022
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.

None yet

3 participants