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: calculate lwp based on LA for leave types including holidays on salary slip #1574

Merged
merged 1 commit into from
Mar 26, 2024

Conversation

KerollesFathy
Copy link
Contributor

@KerollesFathy KerollesFathy commented Mar 24, 2024

Fixes #1573

@KerollesFathy KerollesFathy changed the title fix: leave type include holidays when calc lwp based on leave applica… fix: leave type include holidays when calc lwp based on LA on salary slip Mar 24, 2024
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.86%. Comparing base (c70603b) to head (bb9e56c).

Additional details and impacted files
@@                Coverage Diff                 @@
##           version-15-hotfix    #1574   +/-   ##
==================================================
  Coverage              72.86%   72.86%           
==================================================
  Files                    202      202           
  Lines                  11172    11172           
==================================================
  Hits                    8140     8140           
  Misses                  3032     3032           
Files Coverage Δ
hrms/payroll/doctype/salary_slip/salary_slip.py 86.36% <100.00%> (ø)

@KerollesFathy KerollesFathy changed the title fix: leave type include holidays when calc lwp based on LA on salary slip fix: calculate lwp based on LA for leave types including holidays on salary slip Mar 24, 2024
@ruchamahabal ruchamahabal merged commit 03995bf into frappe:version-15-hotfix Mar 26, 2024
13 checks passed
mergify bot pushed a commit that referenced this pull request Mar 26, 2024
…salary slip (#1574)

(cherry picked from commit 03995bf)

# Conflicts:
#	hrms/payroll/doctype/salary_slip/salary_slip.py
mergify bot pushed a commit that referenced this pull request Mar 26, 2024
ruchamahabal pushed a commit that referenced this pull request Mar 26, 2024
…salary slip (backport #1574) (#1578)

(cherry picked from commit 03995bf)

Co-authored-by: Kerolles Fathy <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Mar 27, 2024
# [15.15.0](v15.14.2...v15.15.0) (2024-03-27)

### Bug Fixes

* add filter for employee in vehicle log (backport [#1571](#1571)) ([#1582](#1582)) ([3d6f333](3d6f333))
* blue color tap highlighting (backport [#1589](#1589)) ([#1593](#1593)) ([affdd4e](affdd4e))
* bold in group by and options mapping (backport [#1564](#1564)) ([#1580](#1580)) ([5f917ce](5f917ce))
* calculate lwp based on LA for leave types including holidays on salary slip ([#1574](#1574)) ([03995bf](03995bf))
* incorrect IFSC codes in bank remittance report (backport [#1538](#1538)) ([#1584](#1584)) ([920e8f4](920e8f4))

### Features

* **PWA:** allow adding attachments in Leave & Advances (backport [#1591](#1591)) ([#1592](#1592)) ([05d5844](05d5844))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.15.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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.

4 participants