From 45e41827c76526412ec29e5d5678d90360f65631 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 27 Nov 2024 17:20:36 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/selling/doctype/sales_order/sales_order_list.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js index 73ef164f5c1..46d115a1713 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.js +++ b/erpnext/selling/doctype/sales_order/sales_order_list.js @@ -20,13 +20,7 @@ frappe.listview_settings["Sales Order"] = { return [__("On Hold"), "orange", "status,=,On Hold"]; } else if (doc.status === "Completed") { return [__("Completed"), "green", "status,=,Completed"]; -<<<<<<< HEAD - } else if (!doc.skip_delivery_note && flt(doc.per_delivered, 2) < 100) { -======= - } else if (doc.advance_payment_status === "Requested") { - return [__("To Pay"), "gray", "advance_payment_status,=,Requested"]; } else if (!doc.skip_delivery_note && flt(doc.per_delivered) < 100) { ->>>>>>> eff9cd10cd (fix: remove field precision in SO and PO for percentage fields) if (frappe.datetime.get_diff(doc.delivery_date) < 0) { // not delivered & overdue return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Closed"];