Skip to content

fix: update employee tax exemption category link in workspace (backport #3472) #3484

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
Aug 19, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 18, 2025

Issue: Incorrect Employee Tax Exemption Category link in Tax & Benefits workspace
ref: 46503

imagefaf820

Backport needed for v15 & v14

Summary by CodeRabbit

  • Style

    • Renamed workspace link from “Employee Tax Exemption Declaration Category” to “Employee Tax Exemption Category” and updated its destination for consistent navigation.
  • Chores

    • Normalized patches file line ending (formatting only; no functional changes).

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

(cherry picked from commit 9d2083c)

# Conflicts:
#	hrms/patches.txt
#	hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json
@mergify mergify bot added the conflicts label Aug 18, 2025
@mergify mergify bot requested a review from ruchamahabal as a code owner August 18, 2025 11:43
Copy link
Contributor Author

mergify bot commented Aug 18, 2025

Cherry-pick of 9d2083c has failed:

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

You are currently cherry-picking commit 9d2083c9.
  (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:   hrms/patches.txt
	both modified:   hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json

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

@asmitahase asmitahase assigned asmitahase and unassigned asmitahase Aug 19, 2025
@asmitahase
Copy link
Collaborator

@venkat102 Could you resolve conflicts on backported PRs for this one

@venkat102
Copy link
Collaborator

@asmitahase, conflicts are resolved

@asmitahase asmitahase merged commit 45f7a66 into version-14-hotfix Aug 19, 2025
7 checks passed
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