Skip to content

fix: Set complete contact details for Employee in PE (backport #46683) #46773

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

Merged
merged 2 commits into from
Apr 14, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 28, 2025

Issue: Contact details not auto-completing when party type is Employee

Root Cause:

  1. Can't create a Contact document for Employee type
  2. Employee contact details are stored directly in the Employee document rather than a separate Contact

Changes Implemented:

  • Updated depends_on conditions for Contact Person and Contact Email fields to support Employee party type
  • Added auto-completion of contact details for Employee party type

Note

Backport to version-15 and version-14


This is an automatic backport of pull request #46683 done by Mergify.

fix: Set complete contact details for `Employee` in PE
(cherry picked from commit 8c9d630)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.json
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
Copy link
Contributor Author

mergify bot commented Mar 28, 2025

Cherry-pick of 8c9d630 has failed:

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

You are currently cherry-picking commit 8c9d630ee4.
  (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:   erpnext/accounts/party.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/payment_entry/payment_entry.json
	both modified:   erpnext/accounts/doctype/payment_entry/payment_entry.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 accounts needs-tests This PR needs automated unit-tests. labels Mar 28, 2025
@ljain112 ljain112 force-pushed the mergify/bp/version-15-hotfix/pr-46683 branch from 64f3f47 to bde55d2 Compare April 1, 2025 13:21
@ljain112 ljain112 removed needs-tests This PR needs automated unit-tests. conflicts labels Apr 3, 2025
@Abdeali099
Copy link
Contributor

Abdeali099 commented Apr 5, 2025

@ruthra-kumar

@ruthra-kumar ruthra-kumar self-assigned this Apr 8, 2025
@ruthra-kumar ruthra-kumar removed the request for review from deepeshgarg007 April 8, 2025 11:37
@ruthra-kumar ruthra-kumar merged commit 4fd99ed into version-15-hotfix Apr 14, 2025
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-46683 branch April 14, 2025 12:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants