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: creation of contact, customer, opportunity, quotation and prospect from lead (backport #42014) #43296

Open
wants to merge 2 commits into
base: version-15-hotfix
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2024

versions: dev & 15

fixes: #42009

Before:

Before_Lead.mov

After:

after_lead.mp4

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

…ct from lead

(cherry picked from commit 8304d19)

# Conflicts:
#	erpnext/crm/doctype/lead/lead.js
…ct from lead --prettier

(cherry picked from commit 5844897)

# Conflicts:
#	erpnext/crm/doctype/lead/lead.js
Copy link
Contributor Author

mergify bot commented Sep 19, 2024

Cherry-pick of 8304d19 has failed:

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

You are currently cherry-picking commit 8304d19e8b.
  (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:   erpnext/crm/doctype/lead/lead.js

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 5844897 has failed:

On branch mergify/bp/version-15-hotfix/pr-42014
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 5844897c34.
  (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:   erpnext/crm/doctype/lead/lead.js

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruthra-kumar
Copy link
Member

@Nihantra-Patel Could you resolve the conflicts?

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

Successfully merging this pull request may close these issues.

2 participants