fix: remove check for already allocated earned leaves #30931
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…aves - removing this until there's a better way to update existing allocations
Codecov Report
@@ Coverage Diff @@
## develop #30931 +/- ##
===========================================
+ Coverage 63.01% 63.08% +0.07%
===========================================
Files 983 983
Lines 67062 67067 +5
===========================================
+ Hits 42256 42312 +56
+ Misses 24806 24755 -51
|
mergify bot
pushed a commit
that referenced
this pull request
May 9, 2022
* fix: remove check for already allocated earned leaves * fix: do not set New Leaves Allocated field as read-only for earned leaves - removing this until there's a better way to update existing allocations (cherry picked from commit f92bc4d)
ruchamahabal
added a commit
that referenced
this pull request
May 9, 2022
* fix: remove check for already allocated earned leaves * fix: do not set New Leaves Allocated field as read-only for earned leaves - removing this until there's a better way to update existing allocations (cherry picked from commit f92bc4d) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
May 10, 2022
# [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))
hrwX
pushed a commit
to hrwX/erpnext
that referenced
this pull request
May 10, 2022
* fix: remove check for already allocated earned leaves * fix: do not set New Leaves Allocated field as read-only for earned leaves - removing this until there's a better way to update existing allocations
deepeshgarg007
pushed a commit
to deepeshgarg007/erpnext
that referenced
this pull request
May 13, 2022
# [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))
mergify bot
pushed a commit
that referenced
this pull request
May 15, 2022
# [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
hrwX
pushed a commit
to hrwX/erpnext
that referenced
this pull request
May 20, 2022
# [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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Leave allocation for earned leaves happens through a scheduler job and there is a check to find out if the required number of earned leaves has been already allocated to avoid duplicates.
However, the "New Leaves Allocated" field was editable before, even for earned leaves, and users might have edited the leave allocation so this check doesn't work as expected. This field was recently made read-only if it's an earned leave in #30613. Removing this too, until there's a better way to update existing allocations.
Remove the check to continue the allocation of leaves as it's not really necessary.
P.S Updating existing leave allocations by directly editing the New Leaves Allocated field by putting in any number is bad UX and creates inconsistencies. Will fix this UX later.