Skip to content

Commit

Permalink
fix: add expected_start_date in sort by
Browse files Browse the repository at this point in the history
(cherry picked from commit 3d54fd8)
  • Loading branch information
shariquerik authored and mergify[bot] committed Jan 8, 2024
1 parent 672e6d6 commit b064944
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 7 deletions.
3 changes: 2 additions & 1 deletion erpnext/projects/doctype/project/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
"set_only_once": 1
},
{
"bold": 1,
"fieldname": "expected_start_date",
"fieldtype": "Date",
"label": "Expected Start Date",
Expand Down Expand Up @@ -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",
Expand Down
53 changes: 53 additions & 0 deletions erpnext/projects/doctype/project/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,59 @@


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",
Expand Down
3 changes: 2 additions & 1 deletion erpnext/projects/doctype/task/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
"label": "Timeline"
},
{
"bold": 1,
"fieldname": "exp_start_date",
"fieldtype": "Date",
"label": "Expected Start Date",
Expand Down Expand Up @@ -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",
Expand Down
7 changes: 2 additions & 5 deletions erpnext/projects/doctype/task/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b064944

Please sign in to comment.