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

feat: Include before_print in doctype event of Server Script (backport #25858) #25860

Merged
merged 2 commits into from
Apr 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 8, 2024

Screenshot from 2024-04-08 17-36-25


This is an automatic backport of pull request #25858 done by [Mergify](https://mergify.com).

(cherry picked from commit 9ee221b)

# Conflicts:
#	frappe/core/doctype/server_script/server_script.json
#	frappe/core/doctype/server_script/server_script_utils.py
@mergify mergify bot added the conflicts label Apr 8, 2024
@mergify mergify bot requested review from a team and ankush and removed request for a team April 8, 2024 12:36
Copy link
Contributor Author

mergify bot commented Apr 8, 2024

Cherry-pick of 9ee221b has failed:

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

You are currently cherry-picking commit 9ee221bc41.
  (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/server_script/server_script.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/server_script/server_script.json
	both modified:   frappe/core/doctype/server_script/server_script_utils.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the add-test-cases Add test case to validate fix or enhancement label Apr 8, 2024
@sagarvora sagarvora removed conflicts add-test-cases Add test case to validate fix or enhancement labels Apr 8, 2024
@sagarvora sagarvora enabled auto-merge (squash) April 8, 2024 12:51
@sagarvora sagarvora merged commit 244be81 into version-15-hotfix Apr 8, 2024
19 checks passed
@sagarvora sagarvora deleted the mergify/bp/version-15-hotfix/pr-25858 branch April 8, 2024 13:08
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.21.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 Apr 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants