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

fix(Asset Repair): Fix GL Entry creation

Browse Source
This commit is contained in:
GangaManoj 2021-06-16 10:42:37 +05:30
parent 491763fa27
commit 6d6aee29e8
1 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,8 +9,9 @@ from frappe.utils import time_diff_in_hours, getdate, nowdate, add_months, flt,
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 from erpnext.assets.doctype.asset.asset import get_asset_account
from erpnext.controllers.accounts_controller import AccountsController
class AssetRepair(Document): class AssetRepair(AccountsController):
def validate(self): def validate(self):
if self.repair_status == "Completed" and not self.completion_date: if self.repair_status == "Completed" and not self.completion_date:
self.completion_date = nowdate() self.completion_date = nowdate()
@ -93,39 +94,56 @@ class AssetRepair(Document):
make_gl_entries(gl_entries, cancel) make_gl_entries(gl_entries, cancel)
def get_gl_entries(self): def get_gl_entries(self):
gl_entry = [] gl_entries = []
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 = get_asset_account("fixed_asset_account", asset=self.asset, company=self.company) 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_entries.append(
"doctype": "GL Entry", self.get_gl_dict({
"account": expense_account, "account": expense_account,
"credit": self.total_repair_cost, "credit": self.repair_cost,
"credit_in_account_currency": self.total_repair_cost, "credit_in_account_currency": self.repair_cost,
"against": repair_and_maintenance_account, "against": repair_and_maintenance_account,
"voucher_type": self.doctype, "voucher_type": self.doctype,
"voucher_no": self.name, "voucher_no": self.name,
"cost_center": self.cost_center, "cost_center": self.cost_center,
"posting_date": getdate(), "posting_date": getdate(),
"company": self.company "company": self.company
}) }, item=self)
gl_entry.insert() )
gl_entry = frappe.get_doc({
"doctype": "GL Entry", gl_entries.append(
"account": fixed_asset_account, self.get_gl_dict({
"debit": self.total_repair_cost, "account": expense_account,
"debit_in_account_currency": self.total_repair_cost, "credit": self.total_repair_cost - self.repair_cost,
"against": expense_account, "credit_in_account_currency": self.total_repair_cost - self.repair_cost,
"voucher_type": self.doctype, "against": repair_and_maintenance_account,
"voucher_no": self.name, "voucher_type": self.doctype,
"cost_center": self.cost_center, "voucher_no": self.name,
"posting_date": getdate(), "cost_center": self.cost_center,
"against_voucher_type": "Purchase Invoice", "posting_date": getdate(),
"against_voucher": self.purchase_invoice, "company": self.company
"company": self.company }, item=self)
}) )
gl_entry.insert()
gl_entries.append(
self.get_gl_dict({
"account": fixed_asset_account,
"debit": self.total_repair_cost,
"debit_in_account_currency": self.total_repair_cost,
"against": expense_account,
"voucher_type": self.doctype,
"voucher_no": self.name,
"cost_center": self.cost_center,
"posting_date": getdate(),
"against_voucher_type": "Purchase Invoice",
"against_voucher": self.purchase_invoice,
"company": self.company
}, item=self)
)
return gl_entries
def modify_depreciation_schedule(self): def modify_depreciation_schedule(self):
if self.increase_in_asset_life: if self.increase_in_asset_life: