From 2f3b097d6342d87450fad1394b9a4d5078f012b4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 29 Jul 2015 13:08:27 +0530 Subject: [PATCH] [fix] indicators for sales order, purchase order #3736 --- .../purchase_order/purchase_order_list.js | 8 +++++++- .../doctype/sales_order/sales_order_list.js | 20 ++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js index ee0c9bf83d..0de5286d5e 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js @@ -5,7 +5,13 @@ frappe.listview_settings['Purchase Order'] = { if(doc.status==="Stopped") { return [__("Stopped"), "darkgrey", "status,=,Stopped"]; } else if(flt(doc.per_received) < 100 && doc.status!=="Stopped") { - return [__("Not Received"), "orange", "per_received,<,100|status,!=,Stopped"]; + if(flt(doc.per_billed) < 100) { + return [__("To Receive and Bill"), "orange", + "per_received,<,100|per_billed,<,100|status,!=,Stopped"]; + } else { + return [__("To Receive"), "orange", + "per_received,<,100|per_billed,=,100|status,!=,Stopped"]; + } } else if(flt(doc.per_received) == 100 && flt(doc.per_billed) < 100 && doc.status!=="Stopped") { return [__("To Bill"), "orange", "per_received,=,100|per_billed,<,100|status,!=,Stopped"]; } else if(flt(doc.per_received) == 100 && flt(doc.per_billed) == 100 && doc.status!=="Stopped") { diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js index e0c75b6ebd..e4e67fc0d2 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.js +++ b/erpnext/selling/doctype/sales_order/sales_order_list.js @@ -5,12 +5,30 @@ frappe.listview_settings['Sales Order'] = { if(doc.status==="Stopped") { return [__("Stopped"), "darkgrey", "status,=,Stopped"]; } else if(flt(doc.per_delivered) < 100 && frappe.datetime.get_diff(doc.delivery_date) < 0) { + // to bill & overdue return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Stopped"]; + } else if(flt(doc.per_delivered) < 100 && doc.status!=="Stopped") { - return [__("Not Delivered"), "orange", "per_delivered,<,100|status,!=,Stopped"]; + // not delivered + + if(flt(doc.per_billed) < 100) { + // not delivered & not billed + + return [__("To Deliver and Bill"), "orange", + "per_delivered,<,100|per_billed,<,100|status,!=,Stopped"]; + } else { + // not billed + + return [__("To Deliver"), "orange", + "per_delivered,<,100|per_billed,=,100|status,!=,Stopped"]; + } + } else if(flt(doc.per_delivered) == 100 && flt(doc.per_billed) < 100 && doc.status!=="Stopped") { + // to bill return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Stopped"]; + } else if(flt(doc.per_delivered) == 100 && flt(doc.per_billed) == 100 && doc.status!=="Stopped") { + return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Stopped"]; } },