Skip to content

fix:remove date validation for required manpower details #902

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.

Sign up for GitHub

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

Merged
MhmdSinanKT merged 1 commit into from
Apr 10, 2025
Merged

fix:remove date validation for required manpower details #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions beams/beams/custom_scripts/project/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,6 @@ def validate_project(doc, method):
if row.required_from > row.required_to:
frappe.throw(f"Row {row.idx}: 'Required From' date must be before 'Required To' date.")

def validate_project_dates(doc, method):
"""Validate 'Required From' and 'Required To' dates in the Required Manpower Details child table against the project's Expected Start Date and Expected End Date."""
if not doc.expected_start_date or not doc.expected_end_date:
return
for row in doc.required_manpower_details:
if row.required_from and row.required_from < doc.expected_start_date:
frappe.throw(_("Row {0}: Required From ({1}) cannot be before Expected Start Date ({2})").format(
row.idx, row.required_from, doc.expected_start_date
))
if row.required_to and row.required_to < doc.expected_start_date:
frappe.throw(_("Row {0}: Required To ({1}) cannot be before Expected Start Date ({2})").format(
row.idx, row.required_to, doc.expected_start_date
))
if row.required_from and row.required_from > doc.expected_end_date:
frappe.throw(_("Row {0}: Required From ({1}) cannot be after Expected End Date ({2})").format(
row.idx, row.required_from, doc.expected_end_date
))
if row.required_to and row.required_to > doc.expected_end_date:
frappe.throw(_("Row {0}: Required To ({1}) cannot be after Expected End Date ({2})").format(
row.idx, row.required_to, doc.expected_end_date
))

@frappe.whitelist()
def create_adhoc_budget(source_name, target_doc=None):
'''
Expand Down Expand Up @@ -247,7 +225,7 @@ def validate_employee_assignment(doc, method):
@frappe.whitelist()
def create_equipment_request(source_name, equipment_data, required_from, required_to):
"""Creates an Equipment Request for a project with multiple items."""

try:
request_data = json.loads(equipment_data)
except Exception as e:
Expand Down
5 changes: 1 addition & 4 deletions beams/hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,7 @@
"beams.beams.custom_scripts.project.project.update_program_request_status_on_project_completion",
"beams.beams.custom_scripts.project.project.validate_project"
],
"validate": [
"beams.beams.custom_scripts.project.project.validate_employee_assignment",
"beams.beams.custom_scripts.project.project.validate_project_dates"
]
"validate": "beams.beams.custom_scripts.project.project.validate_employee_assignment"
},
"Item": {
"before_insert": [
Expand Down