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.

Sign up for GitHub

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

Jump to bottom

refactor(Salary Structure Assignment): opening balances setup warning + section visibility (backport #2309) #2311

Merged
merged 5 commits into from
Oct 18, 2024
Merged

refactor(Salary Structure Assignment): opening balances setup warning + section visibility (backport #2309) #2311

merged 5 commits into from
Oct 18, 2024

Commits on Oct 18, 2024

  1. refactor: drop setting to control visibility of opening amount fields… 

    … in assignment

- this setting just toggles visibility of the opening earnings till date & tax deducted till date, but if its disabled & amounts are set, these amounts are still considered in payroll

- seems like an overkill to just control visibility

(cherry picked from commit 165b361)

# Conflicts:
#	hrms/payroll/doctype/payroll_settings/payroll_settings.json
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    646882c View commit details
    Browse the repository at this point in the history

  2. refactor(Salary Structure Assignment): relabel opening balances section 

    (cherry picked from commit fc6a21a)

# Conflicts:
#	hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    d953344 View commit details
    Browse the repository at this point in the history

  3. refactor: simplify logic for toggling & warning about opening balances 

    (cherry picked from commit 627e391)

# Conflicts:
#	hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    4c80e40 View commit details
    Browse the repository at this point in the history

  4. fix: show opening balances section if employee joined after payroll p… 

    …eriod

(cherry picked from commit df980ce)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    eaa753a View commit details
    Browse the repository at this point in the history

  5. chore: fix conflicts

    @ruchamahabal
    ruchamahabal committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    6185597 View commit details
    Browse the repository at this point in the history