mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-04 10:14:39 +00:00
feat: add on hold status to project
(cherry picked from commit 672fadaa78)
This commit is contained in:
committed by
Mergify
parent
6d47c51c5b
commit
57a49ce168
@@ -86,7 +86,7 @@
|
|||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "status",
|
"oldfieldname": "status",
|
||||||
"oldfieldtype": "Select",
|
"oldfieldtype": "Select",
|
||||||
"options": "Open\nCompleted\nCancelled",
|
"options": "Open\nOn hold\nCompleted\nCancelled",
|
||||||
"search_index": 1
|
"search_index": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -482,7 +482,7 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"max_attachments": 4,
|
"max_attachments": 4,
|
||||||
"modified": "2026-05-22 16:45:50.762759",
|
"modified": "2026-07-14 14:20:50.418911",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Projects",
|
"module": "Projects",
|
||||||
"name": "Project",
|
"name": "Project",
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ class Project(Document):
|
|||||||
project_type: DF.Link | None
|
project_type: DF.Link | None
|
||||||
sales_order: DF.Link | None
|
sales_order: DF.Link | None
|
||||||
second_email: DF.Time | None
|
second_email: DF.Time | None
|
||||||
status: DF.Literal["Open", "Completed", "Cancelled"]
|
status: DF.Literal["Open", "On hold", "Completed", "Cancelled"]
|
||||||
subject: DF.Data | None
|
subject: DF.Data | None
|
||||||
to_time: DF.Time | None
|
to_time: DF.Time | None
|
||||||
total_billable_amount: DF.Currency
|
total_billable_amount: DF.Currency
|
||||||
@@ -262,8 +262,8 @@ class Project(Document):
|
|||||||
pct_complete += row["progress"] * frappe.utils.safe_div(row["task_weight"], weight_sum)
|
pct_complete += row["progress"] * frappe.utils.safe_div(row["task_weight"], weight_sum)
|
||||||
self.percent_complete = flt(flt(pct_complete), 2)
|
self.percent_complete = flt(flt(pct_complete), 2)
|
||||||
|
|
||||||
# don't update status if it is cancelled
|
# don't update status if it is manually set to cancelled or on hold
|
||||||
if self.status == "Cancelled":
|
if self.status in ("Cancelled", "On hold"):
|
||||||
return
|
return
|
||||||
|
|
||||||
self.status = "Completed" if self.percent_complete == 100 else "Open"
|
self.status = "Completed" if self.percent_complete == 100 else "Open"
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ frappe.listview_settings["Project"] = {
|
|||||||
get_indicator: function (doc) {
|
get_indicator: function (doc) {
|
||||||
if (doc.status == "Open" && doc.percent_complete) {
|
if (doc.status == "Open" && doc.percent_complete) {
|
||||||
return [__("{0}%", [cint(doc.percent_complete)]), "orange", "percent_complete,>,0|status,=,Open"];
|
return [__("{0}%", [cint(doc.percent_complete)]), "orange", "percent_complete,>,0|status,=,Open"];
|
||||||
|
} else if (doc.status == "On hold") {
|
||||||
|
return [__("On hold"), "blue", "status,=,On hold"];
|
||||||
} else {
|
} else {
|
||||||
return [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status];
|
return [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user