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

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

Merged
merged 5 commits into from
Oct 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 18, 2024

Simplified overengineered setup for setting opening balances in salary structure assignments:

  • Remove a checkbox from Payroll Settings. This setting just toggles the visibility of the opening earnings till date & tax deducted till date, but if it's disabled & amounts are set, these amounts are still considered in the payroll. Seems like an overkill for just controlling visibility
    image

  • Relabelled opening balances section
    image

  • Simplified logic for toggling & warning about opening balances. Too much back and forth between functions, buggy and typos in functions

Closes #1853


This is an automatic backport of pull request #2309 done by [Mergify](https://mergify.com).

… 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
(cherry picked from commit fc6a21a)

# Conflicts:
#	hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json
(cherry picked from commit 627e391)

# Conflicts:
#	hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js
@mergify mergify bot requested a review from ruchamahabal as a code owner October 18, 2024 14:44
@mergify mergify bot added the conflicts label Oct 18, 2024
Copy link
Contributor Author

mergify bot commented Oct 18, 2024

Cherry-pick of 165b361 has failed:

On branch mergify/bp/version-15-hotfix/pr-2309
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 165b361ed.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/payroll_settings/payroll_settings.json

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of fc6a21a has failed:

On branch mergify/bp/version-15-hotfix/pr-2309
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit fc6a21aaa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 627e391 has failed:

On branch mergify/bp/version-15-hotfix/pr-2309
Your branch is ahead of 'origin/version-15-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 627e391b8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruchamahabal ruchamahabal merged commit e224c6b into version-15-hotfix Oct 18, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant