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

fix: remove leave policy assignment creation patch #31097

Merged
merged 3 commits into from
Jun 1, 2022

Conversation

ruchamahabal
Copy link
Member

@ruchamahabal ruchamahabal commented May 23, 2022

  • This patch was written in feat: Leave policy assignment #23112 where leaves were granted explicitly after creating policy assignments.
  • This was refactored in feat: Leave Policy Assignment Refactor #24327 where this redundant "Grant Leaves" button was removed and leaves were granted on submission of policy assignment.
  • This patch doesn't seem to be required since policy assignments never used to get created automatically.
  • Moreover, creating assignments without Leave Period information, breaks this patch a lot during migrations and there is no other way to patch this.
  • If successful, it just allocates leaves arbitrarily on migration based on defaults set in the employee master which is also not correct.

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label May 23, 2022
@ruchamahabal ruchamahabal requested review from nabinhait and removed request for ankush, nextchamp-saqib, marination and deepeshgarg007 May 23, 2022 09:16
@ruchamahabal ruchamahabal removed the needs-tests This PR needs automated unit-tests. label May 23, 2022
@codecov
Copy link

codecov bot commented May 23, 2022

Codecov Report

Merging #31097 (7ae6c90) into develop (5fd31c6) will decrease coverage by 0.29%.
The diff coverage is n/a.

❗ Current head 7ae6c90 differs from pull request most recent head 70a59cd. Consider uploading reports for the commit 70a59cd to get more accurate results

@@             Coverage Diff             @@
##           develop   #31097      +/-   ##
===========================================
- Coverage    63.34%   63.04%   -0.30%     
===========================================
  Files          986      986              
  Lines        67367    67358       -9     
===========================================
- Hits         42673    42468     -205     
- Misses       24694    24890     +196     
Impacted Files Coverage Δ
...eport/item_variant_details/item_variant_details.py 31.32% <0.00%> (-53.02%) ⬇️
erpnext/hr/doctype/job_opening/job_opening.py 28.20% <0.00%> (-43.59%) ⬇️
...mission/employee_tax_exemption_proof_submission.py 76.92% <0.00%> (-23.08%) ⬇️
...e_sales_analytics/supplier_wise_sales_analytics.py 59.01% <0.00%> (-22.96%) ⬇️
..._declaration/employee_tax_exemption_declaration.py 75.00% <0.00%> (-18.94%) ⬇️
erpnext/regional/india/utils.py 64.50% <0.00%> (-10.92%) ⬇️
...t/accounts/report/sales_register/sales_register.py 70.76% <0.00%> (-7.02%) ⬇️
...urity_shortfall/process_loan_security_shortfall.py 93.75% <0.00%> (-6.25%) ⬇️
erpnext/hr/doctype/job_offer/job_offer.py 82.92% <0.00%> (-4.88%) ⬇️
...e/asset_value_adjustment/asset_value_adjustment.py 86.04% <0.00%> (-3.49%) ⬇️
... and 42 more

@ruchamahabal
Copy link
Member Author

ruchamahabal commented Jun 1, 2022

Will look into the failing test test_unmarked_days in a separate PR

@ruchamahabal ruchamahabal merged commit d4b9cc0 into frappe:develop Jun 1, 2022
mergify bot pushed a commit that referenced this pull request Jun 1, 2022
(cherry picked from commit d4b9cc0)

# Conflicts:
#	erpnext/patches.txt
ruchamahabal added a commit that referenced this pull request Jun 1, 2022
…31204)

* fix: remove leave policy assignment creation patch (#31097)

(cherry picked from commit d4b9cc0)

# Conflicts:
#	erpnext/patches.txt

* chore: fix conflicts

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jun 7, 2022
# [13.33.0](v13.32.0...v13.33.0) (2022-06-07)

### Bug Fixes

* Close unsecured terms loans ([d6d1d79](d6d1d79))
* Consider only Approved leave applications in LWP, Employee Benefit calculations ([7f84c86](7f84c86))
* display currencies in validation message. ([ef22337](ef22337))
* incorrect billed_qty in sales order analysis report when multiple delivery notes for item (backport [#31194](#31194)) ([#31250](#31250)) ([3b1f6da](3b1f6da))
* incorrect LWP calculation for half days in employee benefit application ([10f0c93](10f0c93))
* **India:** GSTIN filter in GSTR-1 report ([abe9fe7](abe9fe7))
* **India:** Supplies from composite dealer not showing up ([15712c7](15712c7))
* **job card:** only hold during draft state (backport [#31243](#31243)) ([#31249](#31249)) ([a7fc278](a7fc278))
* **Leave Application:** 'Cancelled' status shown as 'Open' in list view ([8b48d45](8b48d45))
* leave balance for earned leaves in backdated Leave Application dashboard (backport [#31253](#31253)) ([#31256](#31256)) ([a22d92f](a22d92f))
* only fetch membership expiry if not already set in `member.js` ([#31259](#31259)) ([d433784](d433784))
* Parent dimension filters in orders ([b3cbcd8](b3cbcd8))
* Pluralize year text instead of optional bracket (backport [#31210](#31210)) ([#31212](#31212)) ([b31709c](b31709c))
* re-validate warehouse after 'update items' (backport [#31203](#31203)) ([#31206](#31206)) ([3a718c7](3a718c7))
* remove leave policy assignment creation patch (backport [#31097](#31097)) ([#31204](#31204)) ([4aeb448](4aeb448))
* Remove redundant query ([3c4cf59](3c4cf59))
* Reverse provisional entries on Purchase Invoice cancel ([1fba432](1fba432))
* **Sales Register:** incorrect query with dimensions (backport [#31242](#31242)) ([#31251](#31251)) ([0badfc8](0badfc8))
* Simply cancel reverse entries ([100b8d9](100b8d9))

### Features

* **india:** Improve E-way Bill Cancellation. ([#31088](#31088)) ([622d25e](622d25e))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant