From a6c60ffecb9ead0a8d68bfd6ff490d24aee689f1 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 13 Jul 2025 12:02:34 +0530
Subject: [PATCH] fix: added closed_date removed closed_on & added
 expected_deal_value & expected_closure_date field

(cherry picked from commit dcb1e475646e0f0c7096241fcb5bbeb997685230)
---
 crm/fcrm/doctype/crm_deal/crm_deal.json | 33 +++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.json b/crm/fcrm/doctype/crm_deal/crm_deal.json
index 14880fbd..4ce81ec4 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.json
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.json
@@ -18,10 +18,11 @@
   "lost_notes",
   "section_break_jgpm",
   "probability",
+  "expected_deal_value",
   "deal_value",
   "column_break_kpxa",
-  "close_date",
-  "closed_on",
+  "expected_closure_date",
+  "closed_date",
   "contacts_tab",
   "contacts",
   "contact",
@@ -95,11 +96,6 @@
    "fieldtype": "Data",
    "label": "Website"
   },
-  {
-   "fieldname": "close_date",
-   "fieldtype": "Date",
-   "label": "Close Date"
-  },
   {
    "fieldname": "next_step",
    "fieldtype": "Data",
@@ -412,23 +408,34 @@
    "label": "Lost Notes",
    "mandatory_depends_on": "eval: doc.lost_reason == \"Other\""
   },
-  {
-   "fieldname": "closed_on",
-   "fieldtype": "Datetime",
-   "label": "Closed On"
-  },
   {
    "default": "1",
    "description": "The rate used to convert the deal\u2019s currency to your crm's base currency (set in CRM Settings). It is set once when the currency is first added and doesn't change automatically.",
    "fieldname": "exchange_rate",
    "fieldtype": "Float",
    "label": "Exchange Rate"
+  },
+  {
+   "fieldname": "expected_deal_value",
+   "fieldtype": "Currency",
+   "label": "Expected Deal Value",
+   "options": "currency"
+  },
+  {
+   "fieldname": "expected_closure_date",
+   "fieldtype": "Date",
+   "label": "Expected Closure Date"
+  },
+  {
+   "fieldname": "closed_date",
+   "fieldtype": "Date",
+   "label": "Closed Date"
   }
  ],
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-07-09 17:58:55.956639",
+ "modified": "2025-07-13 11:54:20.608489",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal",