fix(Asset Repair): Replace 'Item Name' and 'Item Code' with 'Asset Name'
diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index 1f3978c..92a6648 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -317,8 +317,7 @@
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 962f78f..b9f4138 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -638,12 +638,11 @@
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 d338fc0..853534e 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",
@@ -31,15 +30,6 @@
],
"fields": [
{
- "columns": 1,
- "fieldname": "asset_name",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Asset",
- "options": "Asset",
- "reqd": 1
- },
- {
"fieldname": "naming_series",
"fieldtype": "Select",
"label": "Series",
@@ -51,18 +41,6 @@
"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",
"label": "Repair Details"
@@ -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",