From 5186872b9b9005aa6253f733492d6b11395cbcd9 Mon Sep 17 00:00:00 2001
From: ljain112 <ljain112@gmail.com>
Date: Tue, 20 Aug 2024 13:45:57 +0530
Subject: [PATCH] fix: do not copy date fields in opportunity doctype

(cherry picked from commit 74afa57a9fd6ef1e49eba1e284d02528c5bf08bf)

# Conflicts:
#	erpnext/crm/doctype/opportunity/opportunity.json
---
 erpnext/crm/doctype/opportunity/opportunity.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 07641d20c332..8ca7bcf5c7ed 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -185,7 +185,8 @@
   {
    "fieldname": "expected_closing",
    "fieldtype": "Date",
-   "label": "Expected Closing Date"
+   "label": "Expected Closing Date",
+   "no_copy": 1
   },
   {
    "fieldname": "section_break_14",
@@ -357,6 +358,7 @@
    "fieldname": "transaction_date",
    "fieldtype": "Date",
    "label": "Opportunity Date",
+   "no_copy": 1,
    "oldfieldname": "transaction_date",
    "oldfieldtype": "Date",
    "reqd": 1,
@@ -388,6 +390,7 @@
    "fieldname": "first_response_time",
    "fieldtype": "Duration",
    "label": "First Response Time",
+   "no_copy": 1,
    "read_only": 1
   },
   {
@@ -622,7 +625,11 @@
  "icon": "fa fa-info-sign",
  "idx": 195,
  "links": [],
+<<<<<<< HEAD
  "modified": "2022-10-13 12:42:21.545636",
+=======
+ "modified": "2024-08-20 04:12:29.095761",
+>>>>>>> 74afa57a9f (fix: do not copy date fields in opportunity doctype)
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Opportunity",