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: Set Root as Parent if no parent in new tree view node #22497

Merged
merged 2 commits into from
Jun 29, 2020

Conversation

marination
Copy link
Collaborator

Issue:

  • No parent even after save if no parent is set
    image

Fix:

  • While creating a new Customer Group/ Territory / Sales Person from List View, if no Parent is filled, fetch root node as parent, just like Supplier Group

@marination
Copy link
Collaborator Author

@Mergifyio backport version-13-beta-pre-release

@mergify
Copy link
Contributor

mergify bot commented Jun 29, 2020

Command backport version-13-beta-pre-release: pending

Waiting for the pull request to get merged

@marination
Copy link
Collaborator Author

@Mergifyio backport version-12-hotfix

@mergify
Copy link
Contributor

mergify bot commented Jun 29, 2020

Command backport version-12-hotfix: pending

Waiting for the pull request to get merged

@nabinhait nabinhait merged commit 3e93a2f into frappe:develop Jun 29, 2020
@mergify
Copy link
Contributor

mergify bot commented Jun 29, 2020

Command backport version-12-hotfix: failure

No backport have been created

  • Backport to branch version-12-hotfix failed

Cherry-pick of 3e93a2f has failed:

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

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

Changes to be committed:

	modified:   erpnext/setup/doctype/customer_group/customer_group.py
	modified:   erpnext/setup/doctype/sales_person/sales_person.py

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

	both modified:   erpnext/setup/doctype/territory/territory.py

@mergify
Copy link
Contributor

mergify bot commented Jun 29, 2020

Command backport version-13-beta-pre-release: failure

No backport have been created

  • Backport to branch version-13-beta-pre-release failed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants