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: make promotion details table non-mandatory #559

Merged

Conversation

ruchamahabal
Copy link
Member

Make promotion details table non-mandatory
Only CTC can be updated without any other branch/dept/designation change

- only CTC can be updated without any other branch/dept/designation change
@codecov-commenter
Copy link

Codecov Report

Merging #559 (13a61ab) into develop (97df333) will decrease coverage by 0.01%.
The diff coverage is 50.00%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #559      +/-   ##
===========================================
- Coverage    73.17%   73.16%   -0.01%     
===========================================
  Files          190      190              
  Lines         9871     9873       +2     
===========================================
+ Hits          7223     7224       +1     
- Misses        2648     2649       +1     
Impacted Files Coverage Δ
hrms/hr/utils.py 79.87% <50.00%> (-0.19%) ⬇️

@ruchamahabal ruchamahabal merged commit 5d10fd9 into frappe:develop May 31, 2023
6 checks passed
mergify bot pushed a commit that referenced this pull request May 31, 2023
ruchamahabal added a commit that referenced this pull request May 31, 2023
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request May 31, 2023
# [14.4.0](v14.3.4...v14.4.0) (2023-05-31)

### Bug Fixes

* check if shift is outside assignment period ([1ef0954](1ef0954))
* consider `curr_shift` to retrieve `prev_shift` when possible ([a4889b0](a4889b0))
* make promotion details table non-mandatory (backport [#559](#559)) ([#560](#560)) ([751adf4](751adf4))
* midnight shift not fetched in checkin if assignment is missing on shift's end date ([ab4f980](ab4f980))
* rectify time overlap validation for midnight shifts ([21e71e8](21e71e8))
* remove rounding default for earned leave (backport [#547](#547)) ([#549](#549)) ([8da0656](8da0656))
* set default to zero on salary component. ([#552](#552)) ([d846d84](d846d84))

### Features

* Allow ceil & floor functions in salary slip formulae (backport [#527](#527)) ([#558](#558)) ([f8bb10c](f8bb10c))
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.

None yet

2 participants