From b06494475303bbd50428322060605105e9aec09f Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 8 Jan 2024 16:04:40 +0530 Subject: [PATCH 1/4] fix: add expected_start_date in sort by (cherry picked from commit 3d54fd8389c41b14e8002518b111ebd71fd94186) --- erpnext/projects/doctype/project/project.json | 3 +- erpnext/projects/doctype/project/project.py | 53 +++++++++++++++++++ erpnext/projects/doctype/task/task.json | 3 +- erpnext/projects/doctype/task/task.py | 7 +-- 4 files changed, 59 insertions(+), 7 deletions(-) diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json index 715b09c64b..5917e9b5d2 100644 --- a/erpnext/projects/doctype/project/project.json +++ b/erpnext/projects/doctype/project/project.json @@ -131,6 +131,7 @@ "set_only_once": 1 }, { + "bold": 1, "fieldname": "expected_start_date", "fieldtype": "Date", "label": "Expected Start Date", @@ -453,7 +454,7 @@ "index_web_pages_for_search": 1, "links": [], "max_attachments": 4, - "modified": "2023-08-28 22:27:28.370849", + "modified": "2024-01-08 16:01:34.598258", "modified_by": "Administrator", "module": "Projects", "name": "Project", diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index 4f2e39539d..6f53f4c0b0 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -19,6 +19,59 @@ from erpnext.setup.doctype.holiday_list.holiday_list import is_holiday class Project(Document): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from erpnext.projects.doctype.project_user.project_user import ProjectUser + from frappe.types import DF + + actual_end_date: DF.Date | None + actual_start_date: DF.Date | None + actual_time: DF.Float + collect_progress: DF.Check + company: DF.Link + copied_from: DF.Data | None + cost_center: DF.Link | None + customer: DF.Link | None + daily_time_to_send: DF.Time | None + day_to_send: DF.Literal["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"] + department: DF.Link | None + estimated_costing: DF.Currency + expected_end_date: DF.Date | None + expected_start_date: DF.Date | None + first_email: DF.Time | None + frequency: DF.Literal["Hourly", "Twice Daily", "Daily", "Weekly"] + from_time: DF.Time | None + gross_margin: DF.Currency + holiday_list: DF.Link | None + is_active: DF.Literal["Yes", "No"] + message: DF.Text | None + naming_series: DF.Literal["PROJ-.####"] + notes: DF.TextEditor | None + per_gross_margin: DF.Percent + percent_complete: DF.Percent + percent_complete_method: DF.Literal["Manual", "Task Completion", "Task Progress", "Task Weight"] + priority: DF.Literal["Medium", "Low", "High"] + project_name: DF.Data + project_template: DF.Link | None + project_type: DF.Link | None + sales_order: DF.Link | None + second_email: DF.Time | None + status: DF.Literal["Open", "Completed", "Cancelled"] + to_time: DF.Time | None + total_billable_amount: DF.Currency + total_billed_amount: DF.Currency + total_consumed_material_cost: DF.Currency + total_costing_amount: DF.Currency + total_purchase_cost: DF.Currency + total_sales_amount: DF.Currency + users: DF.Table[ProjectUser] + weekly_time_to_send: DF.Time | None + # end: auto-generated types + def onload(self): self.set_onload( "activity_summary", diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json index 4d2d225242..cc9832b584 100644 --- a/erpnext/projects/doctype/task/task.json +++ b/erpnext/projects/doctype/task/task.json @@ -153,6 +153,7 @@ "label": "Timeline" }, { + "bold": 1, "fieldname": "exp_start_date", "fieldtype": "Date", "label": "Expected Start Date", @@ -398,7 +399,7 @@ "is_tree": 1, "links": [], "max_attachments": 5, - "modified": "2023-11-20 11:42:41.884069", + "modified": "2024-01-08 16:00:41.296203", "modified_by": "Administrator", "module": "Projects", "name": "Task", diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py index 22df846e39..e96b8e4fc6 100755 --- a/erpnext/projects/doctype/task/task.py +++ b/erpnext/projects/doctype/task/task.py @@ -24,9 +24,8 @@ class Task(NestedSet): from typing import TYPE_CHECKING if TYPE_CHECKING: - from frappe.types import DF - from erpnext.projects.doctype.task_depends_on.task_depends_on import TaskDependsOn + from frappe.types import DF act_end_date: DF.Date | None act_start_date: DF.Date | None @@ -57,9 +56,7 @@ class Task(NestedSet): review_date: DF.Date | None rgt: DF.Int start: DF.Int - status: DF.Literal[ - "Open", "Working", "Pending Review", "Overdue", "Template", "Completed", "Cancelled" - ] + status: DF.Literal["Open", "Working", "Pending Review", "Overdue", "Template", "Completed", "Cancelled"] subject: DF.Data task_weight: DF.Float template_task: DF.Data | None From 80a2b79bba8a7160ed4a107516499ff44c805674 Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:29:13 +0530 Subject: [PATCH 2/4] chore: linter fix --- erpnext/projects/doctype/project/project.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index 6f53f4c0b0..8aad772e4b 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -25,9 +25,10 @@ class Project(Document): from typing import TYPE_CHECKING if TYPE_CHECKING: - from erpnext.projects.doctype.project_user.project_user import ProjectUser from frappe.types import DF + from erpnext.projects.doctype.project_user.project_user import ProjectUser + actual_end_date: DF.Date | None actual_start_date: DF.Date | None actual_time: DF.Float @@ -37,7 +38,9 @@ class Project(Document): cost_center: DF.Link | None customer: DF.Link | None daily_time_to_send: DF.Time | None - day_to_send: DF.Literal["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"] + day_to_send: DF.Literal[ + "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" + ] department: DF.Link | None estimated_costing: DF.Currency expected_end_date: DF.Date | None From 1f64b8fcd8d8c74d7afb5575ab7191edfa7fd156 Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:30:03 +0530 Subject: [PATCH 3/4] chore: linter fix --- erpnext/projects/doctype/task/task.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py index e96b8e4fc6..a4d246546c 100755 --- a/erpnext/projects/doctype/task/task.py +++ b/erpnext/projects/doctype/task/task.py @@ -24,9 +24,11 @@ class Task(NestedSet): from typing import TYPE_CHECKING if TYPE_CHECKING: - from erpnext.projects.doctype.task_depends_on.task_depends_on import TaskDependsOn from frappe.types import DF + from erpnext.projects.doctype.task_depends_on.task_depends_on import TaskDependsOn + + act_end_date: DF.Date | None act_start_date: DF.Date | None actual_time: DF.Float @@ -56,7 +58,9 @@ class Task(NestedSet): review_date: DF.Date | None rgt: DF.Int start: DF.Int - status: DF.Literal["Open", "Working", "Pending Review", "Overdue", "Template", "Completed", "Cancelled"] + status: DF.Literal[ + "Open", "Working", "Pending Review", "Overdue", "Template", "Completed", "Cancelled" + ] subject: DF.Data task_weight: DF.Float template_task: DF.Data | None From 8cc9ddaebdf97e1a55c56ced1e3b3ea6b315732d Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:30:26 +0530 Subject: [PATCH 4/4] chore: linter fix --- erpnext/projects/doctype/task/task.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py index a4d246546c..22df846e39 100755 --- a/erpnext/projects/doctype/task/task.py +++ b/erpnext/projects/doctype/task/task.py @@ -28,7 +28,6 @@ class Task(NestedSet): from erpnext.projects.doctype.task_depends_on.task_depends_on import TaskDependsOn - act_end_date: DF.Date | None act_start_date: DF.Date | None actual_time: DF.Float