From 4c2dba98da25fc0f5227502b1c5cd8c537bbb5c0 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Wed, 18 Mar 2026 16:32:56 +0530
Subject: [PATCH] chore: fix conflicts

Removed several fields related to additional transfer entries and subcontracting inward orders from the stock entry JSON.
---
 .../doctype/stock_entry/stock_entry.json      | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index 315893e2129..f37a2785252 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -701,41 +701,6 @@
    "fieldtype": "Data",
    "is_virtual": 1,
    "label": "Last Scanned Warehouse"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "default": "0",
-   "fieldname": "is_additional_transfer_entry",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Is Additional Transfer Entry",
-   "read_only": 1
-  },
-  {
-   "depends_on": "subcontracting_inward_order",
-   "fieldname": "subcontracting_inward_order",
-   "fieldtype": "Link",
-   "label": "Subcontracting Inward Order",
-   "options": "Subcontracting Inward Order",
-   "read_only": 1
-  },
-  {
-   "fieldname": "reference_section",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_jabv",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "reference_details_section",
-   "fieldtype": "Section Break",
-   "label": "Reference"
-  },
-  {
-   "fieldname": "column_break_qpvo",
-   "fieldtype": "Column Break"
   },
   {
    "fieldname": "column_break_wgvc",
@@ -746,7 +711,6 @@
    "fieldtype": "Link",
    "label": "Cost Center",
    "options": "Cost Center"
->>>>>>> 47772f4e77 (feat: add cost center field to the stock entry accounting dimension tab)
   }
  ],
  "icon": "fa fa-file-text",
@@ -754,11 +718,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2025-08-04 19:21:03.338958",
-=======
  "modified": "2026-03-04 19:03:23.426082",
->>>>>>> 47772f4e77 (feat: add cost center field to the stock entry accounting dimension tab)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Entry",