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(Salary Slip): Components not updated when amount evaluates to 0 due to payment days #31425

Merged
merged 2 commits into from
Jun 23, 2022

Conversation

ruchamahabal
Copy link
Member

Steps to Replicate:

  • Salary component Professional Tax is dependent on Gross Pay and Bonus and these components are dependent on payment days:
    formula

  • If the Payment Days are altered after saving by updating "Leave Without Pay", the gross changes to 12000 from 15000 and the professional tax should be 0 as per the formula. But this amount isn't updated because it fails the check made before calling update_component

    before

Fix:

Explicitly check whether the amount is not None so that 0 valued components get updated after payment days are altered:

after

@ruchamahabal
Copy link
Member Author

This will add 0 valued components to the table though 🤔 (which doesn't happen right now). Need to handle that.

@ruchamahabal ruchamahabal marked this pull request as draft June 22, 2022 08:59
@ruchamahabal ruchamahabal marked this pull request as ready for review June 23, 2022 05:15
@ruchamahabal ruchamahabal merged commit abfe926 into frappe:version-13-hotfix Jun 23, 2022
@ruchamahabal ruchamahabal added the backport develop instructs mergify to frontport PR to develop branch label Jun 23, 2022
mergify bot pushed a commit that referenced this pull request Jun 23, 2022
…ue to payment days (#31425)

* fix(Salary Slip): Components not updated when amount evaluates to 0 due to payment days

* fix: remove 0 valued components that have been updated later

(cherry picked from commit abfe926)
frappe-pr-bot pushed a commit that referenced this pull request Jun 28, 2022
## [13.34.2](v13.34.1...v13.34.2) (2022-06-28)

### Bug Fixes

* add UOM validation for planned-qty ([559bde3](559bde3))
* dont update RM items table if not required (backport [#31408](#31408)) ([#31457](#31457)) ([8155306](8155306))
* General Ledger and TB opening entries mismatch issues ([a0c5c73](a0c5c73))
* Monthly depreciation using WDV method ([e7659a1](e7659a1))
* Quotation and Sales Order item sync ([2219132](2219132))
* Respect system precision for user facing balance qty values ([#30837](#30837)) ([642b9c5](642b9c5))
* **Salary Slip:** Components not updated when amount evaluates to 0 due to payment days ([#31425](#31425)) ([abfe926](abfe926))
* translation for filter status on report ([736f206](736f206))
* update ru translate (backport [#31404](#31404)) ([#31417](#31417)) ([8b78a12](8b78a12))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.34.2 🎉

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
Labels
backport develop instructs mergify to frontport PR to develop branch released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants