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

Exclude advances scheduled for deduction when creating expence claim #2552

Merged
merged 10 commits into from
Jan 29, 2025

Conversation

AyshaHakeem
Copy link
Collaborator

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

@AyshaHakeem AyshaHakeem changed the title Fix advances deduction Exclude advances scheduled for deduction when creating expence claim Dec 27, 2024
@AyshaHakeem
Copy link
Collaborator Author

AyshaHakeem commented Dec 27, 2024

replacement of closed pr #2388

@AyshaHakeem AyshaHakeem marked this pull request as draft January 29, 2025 06:52
@nabinhait nabinhait self-assigned this Jan 29, 2025
@AyshaHakeem AyshaHakeem marked this pull request as ready for review January 29, 2025 10:42
@AyshaHakeem AyshaHakeem merged commit c141c7d into frappe:develop Jan 29, 2025
7 checks passed
AyshaHakeem added a commit that referenced this pull request Jan 30, 2025
…2552

fix: Exclude advances scheduled for deduction when creating expense claim (backport #2552)
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