Skip to content

fix(employee-onboaring): use boarding_status instead of status (backport #4080)#4081

Merged
asmitahase merged 2 commits intoversion-15-hotfixfrom
mergify/bp/version-15-hotfix/pr-4080
Feb 5, 2026
Merged

fix(employee-onboaring): use boarding_status instead of status (backport #4080)#4081
asmitahase merged 2 commits intoversion-15-hotfixfrom
mergify/bp/version-15-hotfix/pr-4080

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Feb 5, 2026

Issue: Navigating from List View to Report View in the Employee Onboarding doctype throws the following error:

frappe.exceptions.DataError: Field not permitted in query: tabEmployee Onboarding.status

Ref: 58376

Backport needed for v-15, v-16

Summary by CodeRabbit

Updates

  • Updated the Employee Onboarding status field label to "Boarding Status" for improved clarity.
  • Refined list view indicators to properly display boarding status information.
  • Enhanced list view layout with dynamic row formatting.

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

(cherry picked from commit b5c760c)

# Conflicts:
#	hrms/hr/doctype/employee_onboarding/employee_onboarding.json
@mergify mergify bot requested a review from ruchamahabal as a code owner February 5, 2026 09:10
@mergify mergify bot added the conflicts label Feb 5, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 5, 2026

Cherry-pick of b5c760c has failed:

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

You are currently cherry-picking commit b5c760cab.
  (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:   hrms/hr/doctype/employee_onboarding/employee_onboarding_list.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/employee_onboarding/employee_onboarding.json

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

@asmitahase
Copy link
Copy Markdown
Member

@nareshkannasln could you please resolve the conflicts?

@asmitahase asmitahase merged commit cc18e1d into version-15-hotfix Feb 5, 2026
7 checks passed
@asmitahase asmitahase deleted the mergify/bp/version-15-hotfix/pr-4080 branch February 5, 2026 10:49
@frappe-pr-bot
Copy link
Copy Markdown
Collaborator

🎉 This PR is included in version 15.58.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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.

4 participants