Skip to content

feat: changed hired and allocated checkbox to select field #910

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 17, 2025
Merged

feat: changed hired and allocated checkbox to select field #910

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
29 changes: 9 additions & 20 deletions beams/beams/doctype/allocated_manpower_detail/allocated_manpower_detail.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
"hired_personnel",
"returned_date",
"hired_personnel_contact_info",
"allocated",
"hired",
"returned",
"returned_reason"
"returned_reason",
"status"
],
"fields": [
{
Expand Down Expand Up @@ -72,22 +71,6 @@
"label": "Assigned To",
"read_only": 1
},
{
"default": "0",
"fieldname": "allocated",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Allocated",
"read_only": 1
},
{
"default": "0",
"fieldname": "hired",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Hired",
"read_only": 1
},
{
"default": "0",
"fieldname": "returned",
Expand All @@ -105,12 +88,18 @@
"fieldname": "returned_reason",
"fieldtype": "Small Text",
"label": "Returned Reason"
},
{
"fieldname": "status",
"fieldtype": "Select",
"label": "Status",
"options": "\nAllocated\nHired"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2025-04-17 12:27:42.630541",
"modified": "2025-04-17 15:46:15.951754",
"modified_by": "Administrator",
"module": "BEAMS",
"name": "Allocated Manpower Detail",
Expand Down
2 changes: 1 addition & 1 deletion beams/beams/doctype/external_resource_request/external_resource_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def update_hired_field(doc, method=None):
and get_datetime(resource.required_from) == get_datetime(manpower.assigned_from)
and get_datetime(resource.required_to) == get_datetime(manpower.assigned_to)
):
manpower.hired = 1
manpower.status = 'Hired'

project.save(ignore_permissions=True)
frappe.msgprint(f"Hired manpower updated for Project {doc.project}")
2 changes: 1 addition & 1 deletion beams/beams/doctype/technical_request/technical_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def update_allocated_field(doc):
and emp.required_from == mp.assigned_from
and emp.required_to == mp.assigned_to
):
mp.allocated = 1
mp.status = 'Allocated'

project.save(ignore_permissions=True)
frappe.msgprint(f"Allocated manpower updated for Project {doc.project}")