From dc10ef4287d90028f9a4d2ea74b91af32e51d4de Mon Sep 17 00:00:00 2001
From: khushi8112 <khushirawat23@navgurukul.org>
Date: Tue, 6 Jan 2026 15:49:03 +0530
Subject: [PATCH 1/2] feat: allow data import for asset repair doctype

(cherry picked from commit 49f1688a51c54d0011b877c991587e4fd8454949)

# Conflicts:
#	erpnext/assets/doctype/asset_repair/asset_repair.json
---
 .../assets/doctype/asset_repair/asset_repair.json   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json
index 9b6d878378b..16028e041eb 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.json
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -1,5 +1,6 @@
 {
  "actions": [],
+ "allow_import": 1,
  "autoname": "naming_series:",
  "creation": "2017-10-23 11:38:54.004355",
  "doctype": "DocType",
@@ -249,8 +250,18 @@
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
+<<<<<<< HEAD
  "links": [],
  "modified": "2025-11-17 18:35:54.575265",
+=======
+ "links": [
+  {
+   "link_doctype": "Stock Entry",
+   "link_fieldname": "asset_repair"
+  }
+ ],
+ "modified": "2026-01-06 15:48:13.862505",
+>>>>>>> 49f1688a51 (feat: allow data import for asset repair doctype)
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Repair",
@@ -264,6 +275,7 @@
    "delete": 1,
    "email": 1,
    "export": 1,
+   "import": 1,
    "print": 1,
    "read": 1,
    "report": 1,
@@ -279,6 +291,7 @@
    "delete": 1,
    "email": 1,
    "export": 1,
+   "import": 1,
    "print": 1,
    "read": 1,
    "report": 1,

From dbd2964139de1f66d39d40447c4ababf0e3a216d Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 6 Jan 2026 16:46:20 +0530
Subject: [PATCH 2/2] fix: resolve conflict

---
 .../assets/doctype/asset_repair/asset_repair.json    | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json
index 16028e041eb..45e531d6976 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.json
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -250,18 +250,8 @@
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
-<<<<<<< HEAD
  "links": [],
- "modified": "2025-11-17 18:35:54.575265",
-=======
- "links": [
-  {
-   "link_doctype": "Stock Entry",
-   "link_fieldname": "asset_repair"
-  }
- ],
  "modified": "2026-01-06 15:48:13.862505",
->>>>>>> 49f1688a51 (feat: allow data import for asset repair doctype)
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Repair",
@@ -308,4 +298,4 @@
  "title_field": "asset_name",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}