-
Notifications
You must be signed in to change notification settings - Fork 7.9k
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(ux): add naming series to ERPNext setting workspace (backport #28090) #28103
Merged
AfshanKhan
merged 5 commits into
version-13-hotfix
from
mergify/bp/version-13-hotfix/pr-28090
Oct 27, 2021
Merged
fix(ux): add naming series to ERPNext setting workspace (backport #28090) #28103
AfshanKhan
merged 5 commits into
version-13-hotfix
from
mergify/bp/version-13-hotfix/pr-28090
Oct 27, 2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix(ux): add naming series to setting workspace * fix: doctype link to naming series Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> (cherry picked from commit 0806e32) # Conflicts: # erpnext/setup/workspace/erpnext_settings/erpnext_settings.json
AfshanKhan
reviewed
Oct 27, 2021
AfshanKhan
reviewed
Oct 27, 2021
AfshanKhan
reviewed
Oct 27, 2021
AfshanKhan
reviewed
Oct 27, 2021
AfshanKhan
approved these changes
Oct 27, 2021
asoral
pushed a commit
to asoral/erpnext
that referenced
this pull request
Nov 12, 2021
…ppe#28090) (frappe#28103) * fix(ux): add naming series to ERPNext setting workspace (frappe#28090) * fix(ux): add naming series to setting workspace * fix: doctype link to naming series Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> (cherry picked from commit 0806e32) # Conflicts: # erpnext/setup/workspace/erpnext_settings/erpnext_settings.json * fix: conflicts Co-authored-by: Summayya Hashmani <58825865+sumaiya2908@users.noreply.github.com> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #28090 done by Mergify.
Cherry-pick of 0806e32 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/