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

feat: Salary Component & Structure enhancements #1204

Merged
merged 29 commits into from
Feb 6, 2024

Conversation

krantheman
Copy link
Member

@krantheman krantheman commented Dec 22, 2023

Features

Synax highlighting for Formula

image

Autocompletions for Condition & Formula of the following values -

  • Salary Component Abbreviations
  • Employee Fields
  • Salary Structure Fields
  • Salary Slip FIelds

image

Option to sync Condition & Formula updates to existing Salary Structures

  • Current Formula for House Rent Allowance - B * 0.1

image

  • Update to B * 0.2 and click on Sync Formula

image

  • Change reflected in existing Salary Structures

image

Warning for when Salary Component is created without setting Accounts

image

Documentation

https://frappehr.com/docs/v14/en/salary-component

@codecov-commenter
Copy link

codecov-commenter commented Dec 22, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (eded9ce) 72.46% compared to head (a7c2ce8) 72.57%.
Report is 10 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1204      +/-   ##
===========================================
+ Coverage    72.46%   72.57%   +0.11%     
===========================================
  Files          201      201              
  Lines        10986    11024      +38     
===========================================
+ Hits          7961     8001      +40     
+ Misses        3025     3023       -2     
Files Coverage Δ
.../hr/doctype/leave_application/leave_application.py 80.82% <ø> (ø)
...yroll/doctype/salary_component/salary_component.py 100.00% <100.00%> (ø)
...yroll/doctype/salary_structure/salary_structure.py 81.31% <100.00%> (+1.08%) ⬆️

... and 4 files with indirect coverage changes

@krantheman krantheman changed the title feat: Salary Component enhancements feat: Salary Component & Structure enhancements Feb 5, 2024
@ruchamahabal ruchamahabal merged commit 763fc19 into frappe:develop Feb 6, 2024
7 of 8 checks passed
@krantheman krantheman deleted the salary-component-enhancement branch February 6, 2024 12:03
ruchamahabal added a commit that referenced this pull request Feb 6, 2024
…1204

feat: Salary Component & Structure enhancements (backport #1204)
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