From 3e0e3f0e1b062e38312950bc26b2ca29c86ee47b Mon Sep 17 00:00:00 2001
From: GangaManoj <ganga.manoj98@gmail.com>
Date: Mon, 10 May 2021 23:08:12 +0530
Subject: [PATCH] fix(Asset Repair): Replace 'Item Name' and 'Item Code' with
 'Asset Name'

---
 erpnext/assets/doctype/asset/asset.js         |  3 +-
 erpnext/assets/doctype/asset/asset.py         |  7 ++--
 .../doctype/asset_repair/asset_repair.json    | 42 ++++++++-----------
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index 1f3978c0b0..92a6648c63 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -317,8 +317,7 @@ frappe.ui.form.on('Asset', {
 		frappe.call({
 			args: {
 				"asset": frm.doc.name,
-				"item_code": frm.doc.item_code,
-				"item_name": frm.doc.item_name
+				"asset_name": frm.doc.asset_name
 			},
 			method: "erpnext.assets.doctype.asset.asset.create_asset_repair",
 			callback: function(r) {
diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 962f78fa66..b9f413854f 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -638,12 +638,11 @@ def create_asset_maintenance(asset, item_code, item_name, asset_category, compan
 	return asset_maintenance
 
 @frappe.whitelist()
-def create_asset_repair(asset, item_code, item_name):
+def create_asset_repair(asset, asset_name):
 	asset_repair = frappe.new_doc("Asset Repair")
 	asset_repair.update({
-		"asset_name": asset,
-		"item_code": item_code,
-		"item_name": item_name
+		"asset": asset,
+		"asset_name": asset_name
 	})
 	return asset_repair
 
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json
index d338fc0fb7..853534eb31 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.json
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -8,10 +8,9 @@
  "engine": "InnoDB",
  "field_order": [
   "naming_series",
-  "asset_name",
   "column_break_2",
-  "item_code",
-  "item_name",
+  "asset",
+  "asset_name",
   "section_break_5",
   "failure_date",
   "assign_to",
@@ -30,15 +29,6 @@
   "amended_from"
  ],
  "fields": [
-  {
-   "columns": 1,
-   "fieldname": "asset_name",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Asset",
-   "options": "Asset",
-   "reqd": 1
-  },
   {
    "fieldname": "naming_series",
    "fieldtype": "Select",
@@ -50,18 +40,6 @@
    "fieldname": "column_break_2",
    "fieldtype": "Column Break"
   },
-  {
-   "fetch_from": "asset_name.item_code",
-   "fieldname": "item_code",
-   "fieldtype": "Read Only",
-   "label": "Item Code"
-  },
-  {
-   "fetch_from": "asset_name.item_name",
-   "fieldname": "item_name",
-   "fieldtype": "Read Only",
-   "label": "Item Name"
-  },
   {
    "fieldname": "section_break_5",
    "fieldtype": "Section Break",
@@ -159,12 +137,26 @@
    "options": "Asset Repair",
    "print_hide": 1,
    "read_only": 1
+  },
+  {
+   "columns": 1,
+   "fieldname": "asset",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Asset",
+   "options": "Asset",
+   "reqd": 1
+  },
+  {
+   "fieldname": "asset_name",
+   "fieldtype": "Read Only",
+   "label": "Asset Name"
   }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2021-01-22 15:08:12.495850",
+ "modified": "2021-05-10 22:48:42.165513",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Repair",