hrms
hrms copied to clipboard
refactor: improve onboarding (backport #1472)
Changes
- Remove "Create Employee" step
- Combine "Create Salary Structure" and "Assign Salary Structure" steps
- Add Preview Salary Slip Action for Salary Structure Assignment
- Set default Start & End Date based on Fiscal Year for when first Payroll Period is created
This is an automatic backport of pull request #1472 done by Mergify.
Cherry-pick of 65547990cb1699f37214b5ccdf6dff7aea832e35 has failed:
On branch mergify/bp/version-14-hotfix/pr-1472
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 65547990c.
(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/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js
no changes added to commit (use "git add" and/or "git commit -a")
Cherry-pick of a3060da3d5d30af939d77d46210e7f3d440e1a17 has failed:
On branch mergify/bp/version-14-hotfix/pr-1472
Your branch is ahead of 'origin/version-14-hotfix' by 3 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit a3060da3d.
(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/payroll/onboarding_step/create_payroll_period/create_payroll_period.json
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: hrms/payroll/doctype/payroll_period/payroll_period.js
Cherry-pick of 6f0cab593f7e512f495043aa59db3160cba56792 has failed:
On branch mergify/bp/version-14-hotfix/pr-1472
Your branch is ahead of 'origin/version-14-hotfix' by 4 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 6f0cab593.
(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/payroll/doctype/payroll_period/payroll_period.js
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js
Cherry-pick of 22a9000b370ecc28dafdc9600e1dd8679407675b has failed:
On branch mergify/bp/version-14-hotfix/pr-1472
Your branch is ahead of 'origin/version-14-hotfix' by 5 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 22a9000b3.
(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/payroll/doctype/payroll_period/payroll_period.js
both modified: hrms/payroll/doctype/payroll_period/payroll_period.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
@krantheman can you fix conflicts in both the PRs?
:tada: This PR is included in version 14.28.0 :tada:
The release is available on GitHub release
Your semantic-release bot :package::rocket: