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: round pro-rated leaves #324

Merged
merged 8 commits into from
Feb 16, 2023
Merged

Conversation

rtdany10
Copy link
Contributor

@rtdany10 rtdany10 commented Feb 15, 2023

Employee Date of Joining: 25-01-2023

Leave Policy:
image

Leave Policy Assignment:
image


Leave Allocation(Earned Leave):

Before:
image

After:
(based on leave type rounding)
image

@codecov-commenter
Copy link

codecov-commenter commented Feb 15, 2023

Codecov Report

Merging #324 (24989f4) into develop (f5399eb) will increase coverage by 0.06%.
The diff coverage is 78.57%.

❗ Current head 24989f4 differs from pull request most recent head d7df612. Consider uploading reports for the commit d7df612 to get more accurate results

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #324      +/-   ##
===========================================
+ Coverage    70.91%   70.97%   +0.06%     
===========================================
  Files          181      181              
  Lines         9200     9196       -4     
===========================================
+ Hits          6524     6527       +3     
+ Misses        2676     2669       -7     
Impacted Files Coverage Δ
hrms/hr/utils.py 76.25% <66.66%> (+0.22%) ⬆️
...leave_policy_assignment/leave_policy_assignment.py 91.83% <100.00%> (+0.22%) ⬆️
hrms/hr/doctype/appraisal/appraisal.py 0.00% <0.00%> (ø)
hrms/payroll/doctype/salary_slip/salary_slip.py 87.24% <0.00%> (+0.10%) ⬆️
...oll/doctype/additional_salary/additional_salary.py 70.65% <0.00%> (+0.75%) ⬆️
...s/payroll/doctype/payroll_period/payroll_period.py 86.27% <0.00%> (+1.08%) ⬆️
hrms/hr/doctype/shift_request/shift_request.py 94.36% <0.00%> (+1.12%) ⬆️

@ruchamahabal ruchamahabal self-assigned this Feb 15, 2023
@ruchamahabal
Copy link
Member

why did the CI job not run 🤔

@rtdany10
Copy link
Contributor Author

rtdany10 commented Feb 15, 2023

why did the CI job not run thinking

The force push is the culprit behind that. Probably cause of same commit name?
The test was running when I force pushed and it seem to have vanished somehow.

@ruchamahabal
Copy link
Member

Probably cause of same commit name?

Commit hash is always different so shouldn't cause an issue. Will check the yaml file 🤔

@ruchamahabal
Copy link
Member

@rtdany10 refactored the code a bit:

@ruchamahabal ruchamahabal merged commit f091478 into frappe:develop Feb 16, 2023
ruchamahabal added a commit that referenced this pull request Feb 16, 2023
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.

3 participants