fix(Expense Claim): status update on document cancellation #1392
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
reviewed
Feb 5, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #1392 +/- ##
===========================================
- Coverage 72.51% 72.47% -0.04%
===========================================
Files 201 201
Lines 10986 10987 +1
===========================================
- Hits 7966 7963 -3
- Misses 3020 3024 +4
|
ruchamahabal
approved these changes
Feb 7, 2024
ruchamahabal
added
backport version-14-hotfix
backport version-15-hotfix
and removed
needs-tests
labels
mergify bot
pushed a commit
that referenced
this pull request
Feb 7, 2024
* fix(Expense Claim): status update on document cancellation * chore: improve readability and flow (cherry picked from commit 6403978) # Conflicts: # hrms/hr/doctype/expense_claim/expense_claim.py
mergify bot
pushed a commit
that referenced
this pull request
Feb 7, 2024
* fix(Expense Claim): status update on document cancellation * chore: improve readability and flow (cherry picked from commit 6403978)
ruchamahabal
pushed a commit
that referenced
this pull request
Feb 7, 2024
…1392) (#1405) * fix(Expense Claim): status update on document cancellation * chore: improve readability and flow (cherry picked from commit 6403978) Co-authored-by: Akash Tom <[email protected]>
ruchamahabal
added a commit
that referenced
this pull request
Feb 13, 2024
…1392) (#1404) * fix(Expense Claim): status update on document cancellation (#1392) * fix(Expense Claim): status update on document cancellation * chore: improve readability and flow (cherry picked from commit 6403978) # Conflicts: # hrms/hr/doctype/expense_claim/expense_claim.py * chore: fix conflicts --------- Co-authored-by: Akash Tom <[email protected]> Co-authored-by: Rucha Mahabal <[email protected]>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 13, 2024
## [14.21.6](v14.21.5...v14.21.6) (2024-02-13) ### Bug Fixes * don't consider holidays as Absent when 'Consider Unmarked Attendance As' = Absent ([af4a090](af4a090)) * **Expense Claim:** status update on document cancellation (backport [#1392](#1392)) ([#1404](#1404)) ([943236f](943236f)) * **Monthly Attendance Sheet:** parsing error (backport [#1415](#1415)) ([#1422](#1422)) ([8c3ad08](8c3ad08)) * update leave dashboard string to translatable format (backport [#1418](#1418)) ([#1419](#1419)) ([f71e048](f71e048))
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 13, 2024
## [15.11.1](v15.11.0...v15.11.1) (2024-02-13) ### Bug Fixes * don't consider holidays as Absent when 'Consider Unmarked Attendance' = Absent ([deace66](deace66)) * exclude holidays while getting marked attendance days ([04df09e](04df09e)) * **Expense Claim:** status update on document cancellation (backport [#1392](#1392)) ([#1405](#1405)) ([9c0cd3d](9c0cd3d)) * handle attendance condition for missing holidays ([0452649](0452649)) * **Monthly Attendance Sheet:** parsing error (backport [#1415](#1415)) ([#1423](#1423)) ([2118961](2118961)) * update leave dashboard string to translatable format (backport [#1418](#1418)) ([#1420](#1420)) ([aa49f74](aa49f74))
JulioJair
reviewed
Feb 23, 2024
Comment on lines
+57
to
+60
| if self.docstatus == 1: | ||
| if self.approval_status == "Approved": | ||
| if ( | ||
| # set as paid |
There was a problem hiding this comment.
three levels of nested conditions, dont think is readable @krantheman
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.
Expense Claim status remains "Paid" after canceling, if it has been Paid and Approved, whereas it should be "Cancelled".
no-docs