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: exclude advances scheduled for deduction when adjusting them aga… #2388

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from

Conversation

AyshaHakeem
Copy link
Contributor

@AyshaHakeem AyshaHakeem commented Nov 5, 2024

Adjust the calculation of allocation amounts for expense claims against employee advances. Advances scheduled for salary deduction are now excluded, ensuring the allocation amount reflects the accurate claimable advance amount.

Employee advance:
Screenshot 2024-11-29 at 1 21 09 PM

Creating Expense Claim:
Before:
before

After:
after

Copy link
Member

@ruchamahabal ruchamahabal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a test for this?

},
{
"fieldname": "return_amount",
"fieldtype": "Data",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"fieldtype": "Data",
"fieldtype": "Currency",

Fieldtype should be currency like other amount fields

@AyshaHakeem AyshaHakeem marked this pull request as draft November 16, 2024 15:17
@AyshaHakeem AyshaHakeem marked this pull request as ready for review November 26, 2024 12:44
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.

2 participants