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: create auto_repeat field only if docfield/custom field does not exist (bp #11827) #11951

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 18, 2020

This is an automated backport of pull request #11827 done by Mergify

Cherry-pick of 044da8a has failed:

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

You are currently cherry-picking commit 044da8a575.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   frappe/core/doctype/doctype/doctype.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   frappe/custom/doctype/customize_form/customize_form.py

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

(cherry picked from commit 044da8a)

# Conflicts:
#	frappe/custom/doctype/customize_form/customize_form.py
@mergify mergify bot requested review from surajshetty3416 and a team as code owners November 18, 2020 06:05
@mergify mergify bot added the conflicts label Nov 18, 2020
@ghost ghost removed their request for review November 18, 2020 06:05
@scmmishra scmmishra closed this Nov 18, 2020
@mergify mergify bot deleted the mergify/bp/version-13-beta/pr-11827 branch November 18, 2020 06:15
@scmmishra
Copy link
Contributor

Bad Bot

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 18, 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

2 participants