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 creating expense claim (backport #2552) #2730

Merged
merged 10 commits into from
Jan 30, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 29, 2025

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


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

(cherry picked from commit c0b82e9)

# Conflicts:
#	hrms/hr/doctype/expense_claim_advance/expense_claim_advance.json
(cherry picked from commit 5b018c6)
(cherry picked from commit 16196b4)

# Conflicts:
#	hrms/hr/doctype/expense_claim_advance/expense_claim_advance.json
(cherry picked from commit 9c4bde1)
(cherry picked from commit 542cb89)

# Conflicts:
#	hrms/hr/doctype/employee_advance/employee_advance.json
(cherry picked from commit c3e4e05)

# Conflicts:
#	hrms/hr/doctype/expense_claim_advance/expense_claim_advance.json
@mergify mergify bot requested a review from ruchamahabal as a code owner January 29, 2025 12:21
@mergify mergify bot added the conflicts label Jan 29, 2025
Copy link
Contributor Author

mergify bot commented Jan 29, 2025

Cherry-pick of c0b82e9 has failed:

On branch mergify/bp/version-15-hotfix/pr-2552
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 c0b82e90.
  (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/hr/doctype/employee_advance/employee_advance.js
	modified:   hrms/hr/doctype/expense_claim/expense_claim.js
	modified:   hrms/hr/doctype/expense_claim/expense_claim.py

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

Cherry-pick of 16196b4 has failed:

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

You are currently cherry-picking commit 16196b49.
  (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/hr/doctype/expense_claim_advance/expense_claim_advance.json

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

Cherry-pick of 542cb89 has failed:

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

You are currently cherry-picking commit 542cb892.
  (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/hr/doctype/employee_advance/employee_advance.json

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

Cherry-pick of c3e4e05 has failed:

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

You are currently cherry-picking commit c3e4e057.
  (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/hr/doctype/expense_claim_advance/expense_claim_advance.json

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

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 changed the title Exclude advances scheduled for deduction when creating expence claim (backport #2552) fix: Exclude advances scheduled for deduction when creating expense claim (backport #2552) Jan 30, 2025
@AyshaHakeem AyshaHakeem merged commit 6624b9d into version-15-hotfix Jan 30, 2025
7 of 8 checks passed
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.39.0 🎉

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants