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

feat(HR): Some Enhancements and Onboarding (backport #25741) #27741

Merged
merged 3 commits into from
Oct 2, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 2, 2021

This is an automatic backport of pull request #25741 done by Mergify.
Cherry-pick of 4837238 has failed:

On branch mergify/bp/develop/pr-25741
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit 4837238f3d.
  (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/hr/doctype/holiday_list/holiday_list.js
	modified:   erpnext/hr/doctype/hr_settings/hr_settings.js
	modified:   erpnext/hr/doctype/hr_settings/hr_settings.json
	modified:   erpnext/hr/doctype/leave_allocation/leave_allocation.js
	modified:   erpnext/hr/doctype/leave_allocation/leave_allocation.json
	modified:   erpnext/hr/doctype/leave_application/leave_application.js
	modified:   erpnext/hr/doctype/leave_application/leave_application.py
	modified:   erpnext/hr/doctype/leave_application/test_leave_application.py
	modified:   erpnext/hr/doctype/leave_type/leave_type.js
	modified:   erpnext/hr/doctype/leave_type/leave_type.json
	modified:   erpnext/hr/module_onboarding/human_resource/human_resource.json
	modified:   erpnext/hr/onboarding_step/create_employee/create_employee.json
	modified:   erpnext/hr/onboarding_step/create_holiday_list/create_holiday_list.json
	modified:   erpnext/hr/onboarding_step/create_leave_allocation/create_leave_allocation.json
	modified:   erpnext/hr/onboarding_step/create_leave_application/create_leave_application.json
	modified:   erpnext/hr/onboarding_step/create_leave_type/create_leave_type.json
	new file:   erpnext/hr/onboarding_step/data_import/data_import.json
	modified:   erpnext/hr/onboarding_step/hr_settings/hr_settings.json
	modified:   erpnext/patches.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/hr/doctype/employee/employee.js

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* feat: Hr settings restructure

* feat: remove validation and make As warning

* feat: made leave policy Assignment feild read only

* feat: send leave Notification via 'Notification'

* patch: for field name change

* feat: removed defaults value for removed field

* feat: removed leave Notification fields

* feat: better label and description

* feat: Hr Module onboarding and Onboarding slides

* fix: sider, test, translations

* chore: remove unnecessary code formatting changes

* refactor: HR Onboarding

* refactor: HR Settings

* revert: Notification changes

* chore: remove unnecessary descriptions from leave type

* fix: linter issues

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 4837238)

# Conflicts:
#	erpnext/hr/doctype/employee/employee.js
@mergify mergify bot added the conflicts label Oct 2, 2021
@ruchamahabal ruchamahabal self-assigned this Oct 2, 2021
erpnext/hr/doctype/employee/employee.js Outdated Show resolved Hide resolved
erpnext/hr/doctype/employee/employee.js Outdated Show resolved Hide resolved
erpnext/hr/doctype/employee/employee.js Outdated Show resolved Hide resolved
erpnext/hr/doctype/employee/employee.js Outdated Show resolved Hide resolved
erpnext/hr/doctype/employee/employee.js Outdated Show resolved Hide resolved
erpnext/hr/doctype/employee/employee.js Outdated Show resolved Hide resolved
erpnext/hr/doctype/employee/employee.js Outdated Show resolved Hide resolved
erpnext/hr/doctype/employee/employee.js Outdated Show resolved Hide resolved
erpnext/hr/doctype/employee/employee.js Outdated Show resolved Hide resolved
erpnext/hr/doctype/employee/employee.js Outdated Show resolved Hide resolved
erpnext/hr/doctype/employee/employee.js Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Oct 2, 2021

Codecov Report

Merging #27741 (799be5d) into develop (b9942ad) will decrease coverage by 0.06%.
The diff coverage is 0.00%.

@@             Coverage Diff             @@
##           develop   #27741      +/-   ##
===========================================
- Coverage    54.63%   54.56%   -0.07%     
===========================================
  Files         1343     1343              
  Lines        71040    71044       +4     
===========================================
- Hits         38813    38768      -45     
- Misses       32227    32276      +49     
Impacted Files Coverage Δ
.../hr/doctype/leave_application/leave_application.py 72.74% <0.00%> (-0.68%) ⬇️
...tch_item_expiry_status/batch_item_expiry_status.py 69.81% <0.00%> (-24.53%) ⬇️
erpnext/stock/report/stock_ledger/stock_ledger.py 68.33% <0.00%> (-9.17%) ⬇️
erpnext/stock/report/stock_ageing/stock_ageing.py 84.17% <0.00%> (-5.76%) ⬇️
erpnext/education/doctype/student/student.py 74.46% <0.00%> (-3.20%) ⬇️
...xt/stock/report/stock_analytics/stock_analytics.py 90.09% <0.00%> (-1.99%) ⬇️
...ion/doctype/course_enrollment/course_enrollment.py 45.09% <0.00%> (-1.97%) ⬇️
...eorder_level/itemwise_recommended_reorder_level.py 92.45% <0.00%> (-1.89%) ⬇️
.../report/stock_projected_qty/stock_projected_qty.py 87.01% <0.00%> (-1.30%) ⬇️
erpnext/assets/doctype/asset/asset.py 71.84% <0.00%> (-1.04%) ⬇️
... and 14 more

@ruchamahabal ruchamahabal merged commit 418b9f8 into develop Oct 2, 2021
@mergify mergify bot deleted the mergify/bp/develop/pr-25741 branch October 2, 2021 07:58
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
…rappe#27741)

* feat(HR): Some Enhancements and Onboarding (frappe#25741)

* feat: Hr settings restructure

* feat: remove validation and make As warning

* feat: made leave policy Assignment feild read only

* feat: send leave Notification via 'Notification'

* patch: for field name change

* feat: removed defaults value for removed field

* feat: removed leave Notification fields

* feat: better label and description

* feat: Hr Module onboarding and Onboarding slides

* fix: sider, test, translations

* chore: remove unnecessary code formatting changes

* refactor: HR Onboarding

* refactor: HR Settings

* revert: Notification changes

* chore: remove unnecessary descriptions from leave type

* fix: linter issues

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 51445a6)

# Conflicts:
#	erpnext/hr/doctype/employee/employee.js

* fix: conflicts

* fix: conflicts

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
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.

None yet

2 participants