-
Notifications
You must be signed in to change notification settings - Fork 7.1k
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
feat(Employee Advance): add 'Returned' and 'Partly Claimed and Returned' status #29335
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ruchamahabal
requested review from
ankush,
deepeshgarg007,
marination,
nextchamp-saqib and
pateljannat
as code owners
January 18, 2022 09:24
ruchamahabal
removed request for
ankush,
nextchamp-saqib,
marination,
pateljannat and
deepeshgarg007
January 18, 2022 09:25
ruchamahabal
changed the title
feat(Employee Advance): add 'Returned' and 'Partly Claimed and Return' status
feat(Employee Advance): add 'Returned' and 'Partly Claimed and Returned' status
Jan 18, 2022
ruchamahabal
force-pushed
the
emp-adv-status
branch
from
January 18, 2022 13:05
3cecedc
to
17b1f5f
Compare
Codecov Report
@@ Coverage Diff @@
## develop #29335 +/- ##
===========================================
+ Coverage 55.12% 59.92% +4.79%
===========================================
Files 1084 1084
Lines 68442 68455 +13
===========================================
+ Hits 37729 41019 +3290
+ Misses 30713 27436 -3277
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem:
The main usage of Employee Advance is to allocate it against Expense Claims. Currently, advance only maintains a status for "Claimed" and while allocating advances against a claim, there are two more types of advances that are shown in the list for selection but should not be available for allocation:
Changes:
Add status Returned and Partly Claimed and Returned to Employee Advance so that it's easier to track and allocate. Filter and get advances that don't have Claimed/Returned/Partly Claimed and Returned status for allocation in expenses.
Set title, document states for Employee Advance
Before:
After:
In Expense Claim, advances should be validated after setting totals since they are validated against the total claimed amount. Else, it raises an incorrect validation error.
Patch and test status
Documentation: https://docs.erpnext.com/compare?wiki_page=9d46d7faf4&&compare=3f8062dc4e