fix: Remove changes made to Asset Maintenance
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
index 19393b7e..70b8654 100644
--- a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
@@ -30,10 +30,7 @@
if(!frm.is_new()) {
frm.trigger('make_dashboard');
}
-
- frm.toggle_display(['stock_consumption_details_section'], frm.doc.stock_consumption);
},
-
make_dashboard: (frm) => {
if(!frm.is_new()) {
frappe.call({
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
index 63a5538..c0c2566 100644
--- a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
@@ -12,17 +12,13 @@
"column_break_3",
"item_code",
"item_name",
- "stock_consumption",
"section_break_6",
"maintenance_team",
"column_break_9",
"maintenance_manager",
"maintenance_manager_name",
"section_break_8",
- "asset_maintenance_tasks",
- "stock_consumption_details_section",
- "warehouse",
- "stock_items"
+ "asset_maintenance_tasks"
],
"fields": [
{
@@ -104,33 +100,10 @@
"label": "Maintenance Tasks",
"options": "Asset Maintenance Task",
"reqd": 1
- },
- {
- "default": "0",
- "fieldname": "stock_consumption",
- "fieldtype": "Check",
- "label": "Stock Consumed During Maintenance"
- },
- {
- "fieldname": "stock_consumption_details_section",
- "fieldtype": "Section Break",
- "label": "Stock Consumption Details"
- },
- {
- "fieldname": "warehouse",
- "fieldtype": "Link",
- "label": "Warehouse",
- "options": "Warehouse"
- },
- {
- "fieldname": "stock_items",
- "fieldtype": "Table",
- "label": "Stock Items",
- "options": "Asset Repair Consumed Item"
}
],
"links": [],
- "modified": "2021-06-21 14:53:46.041123",
+ "modified": "2020-05-28 20:28:32.993823",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset Maintenance",
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
index e3e654c..a506dee 100644
--- a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
@@ -19,45 +19,10 @@
if not task.assign_to and self.docstatus == 0:
throw(_("Row #{}: Please asign task to a member.").format(task.idx))
- if self.stock_consumption:
- self.check_for_stock_items_and_warehouse()
- self.increase_asset_value()
- self.decrease_stock_quantity()
-
def on_update(self):
for task in self.get('asset_maintenance_tasks'):
assign_tasks(self.name, task.assign_to, task.maintenance_task, task.next_due_date)
- self.sync_maintenance_tasks()
-
- def check_for_stock_items_and_warehouse(self):
- if self.stock_consumption:
- if not self.stock_items:
- frappe.throw(_("Please enter Stock Items consumed during Asset Maintenance."))
- if not self.warehouse:
- frappe.throw(_("Please enter Warehouse from which Stock Items consumed during Asset Maintenance were taken."))
-
- def increase_asset_value(self):
- asset_value = frappe.db.get_value('Asset', self.asset_name, 'asset_value')
- for item in self.stock_items:
- asset_value += item.total_value
-
- frappe.db.set_value('Asset', self.asset_name, 'asset_value', asset_value)
-
- def decrease_stock_quantity(self):
- stock_entry = frappe.get_doc({
- "doctype": "Stock Entry",
- "stock_entry_type": "Material Issue"
- })
-
- for stock_item in self.stock_items:
- stock_entry.append('items', {
- "s_warehouse": self.warehouse,
- "item_code": stock_item.item,
- "qty": stock_item.consumed_quantity
- })
-
- stock_entry.insert()
- stock_entry.submit()
+ self.sync_maintenance_tasks()
def sync_maintenance_tasks(self):
tasks_names = []