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

Codacy erro fixes

Browse Source
This commit is contained in:
Charles-Henri Decultot 2018-01-06 15:22:40 +00:00
parent 34e335ba34
commit 356839a54b
5 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/assets/doctype/asset/asset.js
View File

@ -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', {

2
erpnext/assets/doctype/asset/asset.py
View File

@ -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 \

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

@ -2,7 +2,4 @@
// For license information, please see license.txt
frappe.ui.form.on('Asset Settings', {
refresh: function(frm) {
}
});

1
erpnext/assets/doctype/asset_settings/asset_settings.py
View File

@ -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):

1
erpnext/assets/doctype/asset_settings/test_asset_settings.py
View File

@ -3,7 +3,6 @@
# See license.txt
from __future__ import unicode_literals
import frappe
import unittest
class TestAssetSettings(unittest.TestCase):