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

fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account

Browse Source
This commit is contained in:
GangaManoj 2021-06-16 08:26:02 +05:30
parent aff9709525
commit 9779aa11fb
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/assets/doctype/asset_repair/asset_repair.py
View File

@ -8,6 +8,7 @@ from frappe import _
from frappe.utils import time_diff_in_hours, getdate, add_months, flt, cint from frappe.utils import time_diff_in_hours, getdate, add_months, flt, cint
from frappe.model.document import Document from frappe.model.document import Document
from erpnext.accounts.general_ledger import make_gl_entries from erpnext.accounts.general_ledger import make_gl_entries
from erpnext.assets.doctype.asset.asset import get_asset_account
class AssetRepair(Document): class AssetRepair(Document):
def validate(self): def validate(self):
@ -100,7 +101,7 @@ class AssetRepair(Document):
def get_gl_entries(self): def get_gl_entries(self):
gl_entry = [] gl_entry = []
repair_and_maintenance_account = frappe.db.get_value('Company', self.company, 'repair_and_maintenance_account') repair_and_maintenance_account = frappe.db.get_value('Company', self.company, 'repair_and_maintenance_account')
fixed_asset_account = self.get_fixed_asset_account() fixed_asset_account = get_asset_account("fixed_asset_account", asset=self.asset, company=self.company)
expense_account = frappe.get_doc('Purchase Invoice', self.purchase_invoice).items[0].expense_account expense_account = frappe.get_doc('Purchase Invoice', self.purchase_invoice).items[0].expense_account
gl_entry = frappe.get_doc({ gl_entry = frappe.get_doc({
@ -132,12 +133,6 @@ class AssetRepair(Document):
}) })
gl_entry.insert() gl_entry.insert()
def get_fixed_asset_account(self):
asset_category = frappe.get_doc('Asset Category', frappe.db.get_value('Asset', self.asset, 'asset_category'))
for account in asset_category.accounts:
if account.company_name == self.company:
return account.fixed_asset_account
def modify_depreciation_schedule(self): def modify_depreciation_schedule(self):
if self.increase_in_asset_life: if self.increase_in_asset_life:
asset = frappe.get_doc('Asset', self.asset) asset = frappe.get_doc('Asset', self.asset)