Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Remove changes made to Asset Maintenance

Browse Source
This commit is contained in:
GangaManoj 2021-06-22 17:16:12 +05:30
parent 55bca4cbc7
commit 307fe43e08
3 changed files with 3 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
View File

@ -30,10 +30,7 @@ frappe.ui.form.on('Asset Maintenance', {
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({

31
erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
View File

@ -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",

35
erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
View File

@ -19,46 +19,11 @@ class AssetMaintenance(Document):
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()
def sync_maintenance_tasks(self):
tasks_names = []
for task in self.get('asset_maintenance_tasks'):