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(Leave Application): Resolved leave type missing for accurate payroll processing #1148

Merged
merged 1 commit into from
Dec 12, 2023

Conversation

Gubbu77
Copy link
Contributor

@Gubbu77 Gubbu77 commented Dec 4, 2023

In the leave application process, attendance is currently updated only when the attendance and leave application statuses differ. However, if attendance was initially created through an employee check-in and a leave application for half-day is later submitted, the leave type is not added. As a result, during payroll processing, the employee may incur a loss of pay for that day.

@Gubbu77
Copy link
Contributor Author

Gubbu77 commented Dec 5, 2023

@ruchamahabal please check

@codecov-commenter
Copy link

Codecov Report

Merging #1148 (459bd38) into develop (a741b51) will decrease coverage by 0.02%.
Report is 121 commits behind head on develop.
The diff coverage is 100.00%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1148      +/-   ##
===========================================
- Coverage    72.75%   72.74%   -0.02%     
===========================================
  Files          199      199              
  Lines        10769    10768       -1     
===========================================
- Hits          7835     7833       -2     
- Misses        2934     2935       +1     
Files Coverage Δ
.../hr/doctype/leave_application/leave_application.py 79.84% <100.00%> (-0.04%) ⬇️

... and 1 file with indirect coverage changes

@ruchamahabal ruchamahabal merged commit fabfdbe into frappe:develop Dec 12, 2023
8 checks passed
mergify bot pushed a commit that referenced this pull request Dec 12, 2023
mergify bot pushed a commit that referenced this pull request Dec 12, 2023
ruchamahabal pushed a commit that referenced this pull request Dec 12, 2023
…oll processing (#1148) (#1171)

(cherry picked from commit fabfdbe)

Co-authored-by: Indrajith.vs <[email protected]>
ruchamahabal pushed a commit that referenced this pull request Dec 12, 2023
…oll processing (#1148) (#1172)

(cherry picked from commit fabfdbe)

Co-authored-by: Indrajith.vs <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Dec 14, 2023
# [14.19.0](v14.18.1...v14.19.0) (2023-12-14)

### Bug Fixes

* duplicate additional salary error msg ([e885365](e885365))
* duplicate Additional Salary with Overwrite Salary Structure Amount enabled ([2477baf](2477baf))
* error/warning message ([8a80dc4](8a80dc4))
* including current document while looking for existing Additional Salaries with Overwrite Amount enabled ([8b54d45](8b54d45))
* interview reminder settings not respected ([#1175](#1175)) ([#1176](#1176)) ([e71c1ff](e71c1ff))
* **Leave Application:** Resolved leave type missing for accurate payroll processing ([#1148](#1148)) ([#1171](#1171)) ([335ba95](335ba95))
* remove statistical component from list view display ([d0eebe2](d0eebe2))
* salary structure warning message ([7e8092b](7e8092b))
* salary structure warning message ([d39abf6](d39abf6))
* section name ([c4ab972](c4ab972))
* validation message formatting ([0fdda87](0fdda87))
* warning message ([bc20f17](bc20f17))

### Features

* add Allow Multiple Shift Assignments to HR Settings ([c65637e](c65637e))
* add Amount Based on Formula to list_view ([f62e97d](f62e97d))
* add client-side validation for Amount Based on Salary ([ef8476d](ef8476d))
* add server-side validation for Amount Based on Salary ([b47cea8](b47cea8))
* add validattion for multiple Shift Assignments ([9c8fcee](9c8fcee))
* validate overlapping dates ([03b7598](03b7598))
frappe-pr-bot pushed a commit that referenced this pull request Dec 14, 2023
# [15.6.0](v15.5.0...v15.6.0) (2023-12-14)

### Bug Fixes

* duplicate additional salary error msg ([a4510ac](a4510ac))
* duplicate Additional Salary with Overwrite Salary Structure Amount enabled ([32707e7](32707e7))
* error/warning message ([4108b8e](4108b8e))
* including current document while looking for existing Additional Salaries with Overwrite Amount enabled ([d4fe189](d4fe189))
* interview reminder settings not respected ([#1175](#1175)) ([#1177](#1177)) ([c5ee94b](c5ee94b))
* **Leave Application:** Resolved leave type missing for accurate payroll processing ([#1148](#1148)) ([#1172](#1172)) ([fab29db](fab29db))
* **PWA:** validate mandatory fields in form view on client-side ([#1178](#1178)) ([#1179](#1179)) ([bc536b0](bc536b0))
* remove statistical component from list view display ([a665c06](a665c06))
* salary structure warning message ([ab3fb35](ab3fb35))
* salary structure warning message ([25e2e3f](25e2e3f))
* section name ([dc5b225](dc5b225))
* validation message formatting ([fca2d4f](fca2d4f))
* warning message ([ccb82fc](ccb82fc))

### Features

* add Allow Multiple Shift Assignments to HR Settings ([fb8e3cd](fb8e3cd))
* add Amount Based on Formula to list_view ([8497f43](8497f43))
* add client-side validation for Amount Based on Salary ([c4a16c6](c4a16c6))
* add server-side validation for Amount Based on Salary ([7659b2d](7659b2d))
* add validattion for multiple Shift Assignments ([d18c4f4](d18c4f4))
* validate overlapping dates ([d8f0adb](d8f0adb))
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