fix: Attendance Request as a draft for a future date #2060
Closed
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
| @@ -19,7 +19,6 @@ class OverlappingAttendanceRequestError(frappe.ValidationError): | |||
| class AttendanceRequest(Document): | |||
| def validate(self): | |||
| validate_active_employee(self.employee) | |||
| validate_dates(self, self.from_date, self.to_date) | |||
There was a problem hiding this comment.
This validation checks if to_date is less than from_date
Attendance Request does not have an explicit validation for future dates, I think. It's only in the Attendance doctype
There was a problem hiding this comment.
okay, you want to say that we have to add a new custom validation to the attendance request and simply remove the "future dates are not valid" validation. right?
new validation like
def validate_dates_for_ar(doc, from_date, to_date):
date_of_joining, relieving_date = frappe.db.get_value(
"Employee", doc.employee, ["date_of_joining", "relieving_date"]
)
if getdate(from_date) > getdate(to_date):
frappe.throw(_("To date cannot be less than from date"))
elif date_of_joining and getdate(from_date) < getdate(date_of_joining):
frappe.throw(_("From date cannot be less than employee's joining date"))
elif relieving_date and getdate(to_date) > getdate(relieving_date):
frappe.throw(_("To date cannot be greater than employee's relieving date"))|
Closing this as #2292 has been merged. |
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.
version 15
fixes: #1957
Before:
After: