diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index 485c8a8e5ab..0a8e3d2c9e6 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -183,7 +183,7 @@ frappe.ui.form.on('Asset', { }) }, - create_asset_maintenance: function(frm) { + create_asset_maintenance: function() { frappe.call({ method: "GET", callback: function(r) { @@ -195,16 +195,16 @@ frappe.ui.form.on('Asset', { calculate_depreciation: function(frm) { frappe.db.get_value("Asset Settings", {'name':"Asset Settings"}, 'schedule_based_on_fiscal_year', (data) => { - if (data.schedule_based_on_fiscal_year == 1) { - frm.set_df_property("depreciation_method", "options", "\nStraight Line\nManual") - frm.toggle_reqd("available_for_use_date", true); - frm.toggle_display("frequency_of_depreciation", false); - frappe.db.get_value("Fiscal Year", {'name': frappe.sys_defaults.fiscal_year}, "year_end_date", (data) => { - frm.set_value("next_depreciation_date", data.year_end_date); - }) - } - }) - } + if (data.schedule_based_on_fiscal_year == 1) { + frm.set_df_property("depreciation_method", "options", "\nStraight Line\nManual") + frm.toggle_reqd("available_for_use_date", true); + frm.toggle_display("frequency_of_depreciation", false); + frappe.db.get_value("Fiscal Year", {'name': frappe.sys_defaults.fiscal_year}, "year_end_date", (data) => { + frm.set_value("next_depreciation_date", data.year_end_date); + }) + } + }) + } }); frappe.ui.form.on('Depreciation Schedule', { diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 96790ce7e4c..519b2f9ece5 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe from frappe import _ -from frappe.utils import flt, add_months, cint, nowdate, getdate, today, date_diff, nowdate +from frappe.utils import flt, add_months, cint, nowdate, getdate, today, date_diff from frappe.model.document import Document from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import get_fixed_asset_account from erpnext.assets.doctype.asset.depreciation \ diff --git a/erpnext/assets/doctype/asset_settings/asset_settings.js b/erpnext/assets/doctype/asset_settings/asset_settings.js index 813278f7e16..3b421486c38 100644 --- a/erpnext/assets/doctype/asset_settings/asset_settings.js +++ b/erpnext/assets/doctype/asset_settings/asset_settings.js @@ -2,7 +2,4 @@ // For license information, please see license.txt frappe.ui.form.on('Asset Settings', { - refresh: function(frm) { - - } }); diff --git a/erpnext/assets/doctype/asset_settings/asset_settings.py b/erpnext/assets/doctype/asset_settings/asset_settings.py index ce0bf58ed0f..e303ebd23f9 100644 --- a/erpnext/assets/doctype/asset_settings/asset_settings.py +++ b/erpnext/assets/doctype/asset_settings/asset_settings.py @@ -3,7 +3,6 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe from frappe.model.document import Document class AssetSettings(Document): diff --git a/erpnext/assets/doctype/asset_settings/test_asset_settings.py b/erpnext/assets/doctype/asset_settings/test_asset_settings.py index 0d22ff18da8..75f146a27ee 100644 --- a/erpnext/assets/doctype/asset_settings/test_asset_settings.py +++ b/erpnext/assets/doctype/asset_settings/test_asset_settings.py @@ -3,7 +3,6 @@ # See license.txt from __future__ import unicode_literals -import frappe import unittest class TestAssetSettings(unittest.TestCase):