Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23011 from ruchamahabal/fix-asset-maintenance-status

Browse Source 
fix: don't set asset maintenance log status as Overdue when Completed or Cancelled
This commit is contained in:
Rucha Mahabal 2020-08-12 19:17:33 +05:30 committed by GitHub
commit cd5821e00a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py
View File

@ -11,7 +11,7 @@ from erpnext.assets.doctype.asset_maintenance.asset_maintenance import calculate
class AssetMaintenanceLog(Document): class AssetMaintenanceLog(Document):
def validate(self): def validate(self):
if getdate(self.due_date) < getdate(nowdate()): if getdate(self.due_date) < getdate(nowdate()) and self.maintenance_status not in ["Completed", "Cancelled"]:
self.maintenance_status = "Overdue" self.maintenance_status = "Overdue"
if self.maintenance_status == "Completed" and not self.completion_date: if self.maintenance_status == "Completed" and not self.completion_date:

17
erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js
View File

@ -1,14 +1,15 @@
frappe.listview_settings['Asset Maintenance Log'] = { frappe.listview_settings['Asset Maintenance Log'] = {
add_fields: ["maintenance_status"], add_fields: ["maintenance_status"],
has_indicator_for_draft: 1,
get_indicator: function(doc) { get_indicator: function(doc) {
if(doc.maintenance_status=="Pending") { if (doc.maintenance_status=="Planned") {
return [__("Pending"), "orange"]; return [__(doc.maintenance_status), "orange", "status,=," + doc.maintenance_status];
} else if(doc.maintenance_status=="Completed") { } else if (doc.maintenance_status=="Completed") {
return [__("Completed"), "green"]; return [__(doc.maintenance_status), "green", "status,=," + doc.maintenance_status];
} else if(doc.maintenance_status=="Cancelled") { } else if (doc.maintenance_status=="Cancelled") {
return [__("Cancelled"), "red"]; return [__(doc.maintenance_status), "red", "status,=," + doc.maintenance_status];
} else if(doc.maintenance_status=="Overdue") { } else if (doc.maintenance_status=="Overdue") {
return [__("Overdue"), "red"]; return [__(doc.maintenance_status), "red", "status,=," + doc.maintenance_status];
} }
} }
}; };