feat(HR): Leave Type configuration to allow over allocation #30940

ruchamahabal · 2022-05-09T11:46:59Z

In Leave Allocation, there is a validation for checking if the number of leaves being allocated is exceeding the number of days in the allocation period. Eg: You cannot allocate 400 leaves for 365 days. But in some organizations, this is allowed. Usually happens when a Leave Type is carry-forwarded every year and this number keeps increasing cumulatively, and eventually exceeds the number of days in the allocation period.

In such cases, the organizations handle it by setting Maximum Consecutive Leaves Allowed to ensure that the employee is not on leave forever.

This doesn't make much sense, but HR policies don't either! 🙈

Added a configuration in Leave Type to "Allow Over Allocation"

If this is enabled, it just warns the user about the scenario

Else, it throws an error as usual

Docs for PR: https://docs.erpnext.com/compare?wiki_page=cab0571766&&compare=3b042fca02#

codecov · 2022-05-09T12:10:43Z

Codecov Report

Merging #30940 (073d818) into develop (f047fa1) will increase coverage by 0.04%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop   #30940      +/-   ##
===========================================
+ Coverage    62.92%   62.97%   +0.04%     
===========================================
  Files          983      983              
  Lines        67068    67070       +2     
===========================================
+ Hits         42205    42236      +31     
+ Misses       24863    24834      -29

Impacted Files	Coverage Δ
...xt/hr/doctype/leave_allocation/leave_allocation.py	`97.31% <100.00%> (+0.03%)`	⬆️
.../report/delayed_item_report/delayed_item_report.py	`60.78% <0.00%> (-35.30%)`	⬇️
...e_sales_analytics/supplier_wise_sales_analytics.py	`59.01% <0.00%> (-31.15%)`	⬇️
...tch_item_expiry_status/batch_item_expiry_status.py	`67.92% <0.00%> (-24.53%)`	⬇️
...wise_balance_history/batch_wise_balance_history.py	`67.79% <0.00%> (-22.04%)`	⬇️
...urity_shortfall/process_loan_security_shortfall.py	`93.75% <0.00%> (-6.25%)`	⬇️
...next/accounts/doctype/bank_account/bank_account.py	`77.27% <0.00%> (-2.28%)`	⬇️
.../report/bom_operations_time/bom_operations_time.py	`89.13% <0.00%> (-2.18%)`	⬇️
erpnext/stock/doctype/warehouse/warehouse.py	`77.62% <0.00%> (-2.10%)`	⬇️
.../report/stock_projected_qty/stock_projected_qty.py	`86.84% <0.00%> (-1.32%)`	⬇️
... and 20 more

(cherry picked from commit 51fcbe5)

…30940) (#30944) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

# [13.29.0](v13.28.0...v13.29.0) (2022-05-10) ### Bug Fixes * Consider paryt and party type as well in group by consolidated view ([189fc89](189fc89)) * disable form save on naming series tool ([#30909](#30909)) ([#30910](#30910)) ([d60a6cb](d60a6cb)) * double future qty updates ([0db3013](0db3013)) * HSN-wise-summary of outward supplies Updated Report ([3637525](3637525)) * Ignore loan repayments made from salary slip ([b7e1d40](b7e1d40)) * **india:** invoice type for a debit note e-invoice ([#30948](#30948)) ([c46add3](c46add3)) * **india:** keyerror while generating e-way bill from an e-invoice ([#30879](#30879)) ([98d799e](98d799e)) * **india:** re-arrange e-way bill dialog fields ([#30941](#30941)) ([7ce5c93](7ce5c93)) * Item Alternative Test ([964de1f](964de1f)) * patch for renaming membership settings ([#30929](#30929)) ([9189653](9189653)) * **pos:** creating pos returns resets pricing rules & discounts ([#30936](#30936)) ([a0e39db](a0e39db)) * remove check for already allocated earned leaves ([#30931](#30931)) ([#30932](#30932)) ([80f7d66](80f7d66)) * Remove commit from stock entry test. The assertion is not important ([c449b35](c449b35)) * Set available-for-use date if missing ([#30838](#30838)) ([bf2eaec](bf2eaec)) * show group warehouse in Sales Order ([#30891](#30891)) ([#30893](#30893)) ([c458e14](c458e14)) * Show linked time sheets in sales invoice dashboard ([4f4af52](4f4af52)) * sort before picking next stock reco ([e27fb58](e27fb58)) * subtract change_amount from paid_amount field on POS Register ([#30937](#30937)) ([b7e873b](b7e873b)) * Unlink and delete batch created from stock reco on cancel ([fc35323](fc35323)) * Wrap SLE actual_qty in `flt` to avoid NoneType operation ([d53228b](d53228b)) ### Features * **HR:** Leave Type configuration to allow over allocation (backport [#30940](#30940)) ([#30944](#30944)) ([64440fc](64440fc)) * **india:** cancel e-way bill is enabled with e-invoicing APIs. ([#30924](#30924)) ([4ef2ffd](4ef2ffd)) * **india:** generate qrcode button for e-invoice ([#30946](#30946)) ([7bd5b2b](7bd5b2b)) * **india:** store e-way bill auto calculated distance in sales invoice ([#30923](#30923)) ([b96f156](b96f156))

…0940)

# [13.29.0](frappe/erpnext@v13.28.0...v13.29.0) (2022-05-10) ### Bug Fixes * Consider paryt and party type as well in group by consolidated view ([189fc89](frappe@189fc89)) * disable form save on naming series tool ([frappe#30909](frappe#30909)) ([frappe#30910](frappe#30910)) ([d60a6cb](frappe@d60a6cb)) * double future qty updates ([0db3013](frappe@0db3013)) * HSN-wise-summary of outward supplies Updated Report ([3637525](frappe@3637525)) * Ignore loan repayments made from salary slip ([b7e1d40](frappe@b7e1d40)) * **india:** invoice type for a debit note e-invoice ([frappe#30948](frappe#30948)) ([c46add3](frappe@c46add3)) * **india:** keyerror while generating e-way bill from an e-invoice ([frappe#30879](frappe#30879)) ([98d799e](frappe@98d799e)) * **india:** re-arrange e-way bill dialog fields ([frappe#30941](frappe#30941)) ([7ce5c93](frappe@7ce5c93)) * Item Alternative Test ([964de1f](frappe@964de1f)) * patch for renaming membership settings ([frappe#30929](frappe#30929)) ([9189653](frappe@9189653)) * **pos:** creating pos returns resets pricing rules & discounts ([frappe#30936](frappe#30936)) ([a0e39db](frappe@a0e39db)) * remove check for already allocated earned leaves ([frappe#30931](frappe#30931)) ([frappe#30932](frappe#30932)) ([80f7d66](frappe@80f7d66)) * Remove commit from stock entry test. The assertion is not important ([c449b35](frappe@c449b35)) * Set available-for-use date if missing ([frappe#30838](frappe#30838)) ([bf2eaec](frappe@bf2eaec)) * show group warehouse in Sales Order ([frappe#30891](frappe#30891)) ([frappe#30893](frappe#30893)) ([c458e14](frappe@c458e14)) * Show linked time sheets in sales invoice dashboard ([4f4af52](frappe@4f4af52)) * sort before picking next stock reco ([e27fb58](frappe@e27fb58)) * subtract change_amount from paid_amount field on POS Register ([frappe#30937](frappe#30937)) ([b7e873b](frappe@b7e873b)) * Unlink and delete batch created from stock reco on cancel ([fc35323](frappe@fc35323)) * Wrap SLE actual_qty in `flt` to avoid NoneType operation ([d53228b](frappe@d53228b)) ### Features * **HR:** Leave Type configuration to allow over allocation (backport [frappe#30940](frappe#30940)) ([frappe#30944](frappe#30944)) ([64440fc](frappe@64440fc)) * **india:** cancel e-way bill is enabled with e-invoicing APIs. ([frappe#30924](frappe#30924)) ([4ef2ffd](frappe@4ef2ffd)) * **india:** generate qrcode button for e-invoice ([frappe#30946](frappe#30946)) ([7bd5b2b](frappe@7bd5b2b)) * **india:** store e-way bill auto calculated distance in sales invoice ([frappe#30923](frappe#30923)) ([b96f156](frappe@b96f156))

# [13.29.0](v13.28.0...v13.29.0) (2022-05-10) ### Bug Fixes * Consider paryt and party type as well in group by consolidated view ([189fc89](189fc89)) * disable form save on naming series tool ([#30909](#30909)) ([#30910](#30910)) ([d60a6cb](d60a6cb)) * double future qty updates ([0db3013](0db3013)) * HSN-wise-summary of outward supplies Updated Report ([3637525](3637525)) * Ignore loan repayments made from salary slip ([b7e1d40](b7e1d40)) * **india:** invoice type for a debit note e-invoice ([#30948](#30948)) ([c46add3](c46add3)) * **india:** keyerror while generating e-way bill from an e-invoice ([#30879](#30879)) ([98d799e](98d799e)) * **india:** re-arrange e-way bill dialog fields ([#30941](#30941)) ([7ce5c93](7ce5c93)) * Item Alternative Test ([964de1f](964de1f)) * patch for renaming membership settings ([#30929](#30929)) ([9189653](9189653)) * **pos:** creating pos returns resets pricing rules & discounts ([#30936](#30936)) ([a0e39db](a0e39db)) * remove check for already allocated earned leaves ([#30931](#30931)) ([#30932](#30932)) ([80f7d66](80f7d66)) * Remove commit from stock entry test. The assertion is not important ([c449b35](c449b35)) * Set available-for-use date if missing ([#30838](#30838)) ([bf2eaec](bf2eaec)) * show group warehouse in Sales Order ([#30891](#30891)) ([#30893](#30893)) ([c458e14](c458e14)) * Show linked time sheets in sales invoice dashboard ([4f4af52](4f4af52)) * sort before picking next stock reco ([e27fb58](e27fb58)) * subtract change_amount from paid_amount field on POS Register ([#30937](#30937)) ([b7e873b](b7e873b)) * Unlink and delete batch created from stock reco on cancel ([fc35323](fc35323)) * Wrap SLE actual_qty in `flt` to avoid NoneType operation ([d53228b](d53228b)) ### Features * **HR:** Leave Type configuration to allow over allocation (backport [#30940](#30940)) ([#30944](#30944)) ([64440fc](64440fc)) * **india:** cancel e-way bill is enabled with e-invoicing APIs. ([#30924](#30924)) ([4ef2ffd](4ef2ffd)) * **india:** generate qrcode button for e-invoice ([#30946](#30946)) ([7bd5b2b](7bd5b2b)) * **india:** store e-way bill auto calculated distance in sales invoice ([#30923](#30923)) ([b96f156](b96f156)) (cherry picked from commit 7369db5) # Conflicts: # erpnext/__init__.py

# [13.29.0](frappe/erpnext@v13.28.0...v13.29.0) (2022-05-10) ### Bug Fixes * Consider paryt and party type as well in group by consolidated view ([189fc89](frappe@189fc89)) * disable form save on naming series tool ([frappe#30909](frappe#30909)) ([frappe#30910](frappe#30910)) ([d60a6cb](frappe@d60a6cb)) * double future qty updates ([0db3013](frappe@0db3013)) * HSN-wise-summary of outward supplies Updated Report ([3637525](frappe@3637525)) * Ignore loan repayments made from salary slip ([b7e1d40](frappe@b7e1d40)) * **india:** invoice type for a debit note e-invoice ([frappe#30948](frappe#30948)) ([c46add3](frappe@c46add3)) * **india:** keyerror while generating e-way bill from an e-invoice ([frappe#30879](frappe#30879)) ([98d799e](frappe@98d799e)) * **india:** re-arrange e-way bill dialog fields ([frappe#30941](frappe#30941)) ([7ce5c93](frappe@7ce5c93)) * Item Alternative Test ([964de1f](frappe@964de1f)) * patch for renaming membership settings ([frappe#30929](frappe#30929)) ([9189653](frappe@9189653)) * **pos:** creating pos returns resets pricing rules & discounts ([frappe#30936](frappe#30936)) ([a0e39db](frappe@a0e39db)) * remove check for already allocated earned leaves ([frappe#30931](frappe#30931)) ([frappe#30932](frappe#30932)) ([80f7d66](frappe@80f7d66)) * Remove commit from stock entry test. The assertion is not important ([c449b35](frappe@c449b35)) * Set available-for-use date if missing ([frappe#30838](frappe#30838)) ([bf2eaec](frappe@bf2eaec)) * show group warehouse in Sales Order ([frappe#30891](frappe#30891)) ([frappe#30893](frappe#30893)) ([c458e14](frappe@c458e14)) * Show linked time sheets in sales invoice dashboard ([4f4af52](frappe@4f4af52)) * sort before picking next stock reco ([e27fb58](frappe@e27fb58)) * subtract change_amount from paid_amount field on POS Register ([frappe#30937](frappe#30937)) ([b7e873b](frappe@b7e873b)) * Unlink and delete batch created from stock reco on cancel ([fc35323](frappe@fc35323)) * Wrap SLE actual_qty in `flt` to avoid NoneType operation ([d53228b](frappe@d53228b)) ### Features * **HR:** Leave Type configuration to allow over allocation (backport [frappe#30940](frappe#30940)) ([frappe#30944](frappe#30944)) ([64440fc](frappe@64440fc)) * **india:** cancel e-way bill is enabled with e-invoicing APIs. ([frappe#30924](frappe#30924)) ([4ef2ffd](frappe@4ef2ffd)) * **india:** generate qrcode button for e-invoice ([frappe#30946](frappe#30946)) ([7bd5b2b](frappe@7bd5b2b)) * **india:** store e-way bill auto calculated distance in sales invoice ([frappe#30923](frappe#30923)) ([b96f156](frappe@b96f156)) (cherry picked from commit 7369db5) # Conflicts: # erpnext/__init__.py

ruchamahabal requested a review from pateljannat as a code owner May 9, 2022 11:46

ruchamahabal added the HR label May 9, 2022

feat(HR): Leave Type configuration to allow over allocation

8358297

ruchamahabal force-pushed the allow-more-leaves branch from 4ccaed1 to 8358297 Compare May 9, 2022 12:43

Merge branch 'develop' into allow-more-leaves

073d818

ruchamahabal merged commit 51fcbe5 into frappe:develop May 9, 2022

ruchamahabal added the backport version-13-hotfix label May 9, 2022

mergify bot pushed a commit that referenced this pull request May 9, 2022

feat(HR): Leave Type configuration to allow over allocation (#30940)

539ba40

(cherry picked from commit 51fcbe5)

mergify bot mentioned this pull request May 9, 2022

feat(HR): Leave Type configuration to allow over allocation (backport #30940) #30944

Merged

ruchamahabal added a commit that referenced this pull request May 10, 2022

feat(HR): Leave Type configuration to allow over allocation (backport #…

64440fc

…30940) (#30944) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

hrwX pushed a commit to hrwX/erpnext that referenced this pull request May 10, 2022

feat(HR): Leave Type configuration to allow over allocation (frappe#3…

69e7a1f

…0940)

deepeshgarg007 mentioned this pull request Jul 18, 2022

List of V14 features & enhancements #31620

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(HR): Leave Type configuration to allow over allocation #30940

feat(HR): Leave Type configuration to allow over allocation #30940

ruchamahabal commented May 9, 2022 •

edited

Loading

codecov bot commented May 9, 2022 •

edited

Loading

feat(HR): Leave Type configuration to allow over allocation #30940

feat(HR): Leave Type configuration to allow over allocation #30940

Conversation

ruchamahabal commented May 9, 2022 • edited Loading

codecov bot commented May 9, 2022 • edited Loading

Codecov Report

ruchamahabal commented May 9, 2022 •

edited

Loading

codecov bot commented May 9, 2022 •

edited

Loading