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

feat(Asset Repair): Create GL Entries to capitalise repair cost

Browse Source
This commit is contained in:
GangaManoj 2021-05-13 03:26:03 +05:30
parent 385ca80ceb
commit 8d05eca45e
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,8 @@ class AssetRepair(Document):
gl_entry = frappe.get_doc({ gl_entry = frappe.get_doc({
"doctype": "GL Entry", "doctype": "GL Entry",
"account": self.payable_account, "account": self.payable_account,
"credit": self.repair_cost, "credit": self.total_repair_cost,
"credit_in_account_currency": self.repair_cost, "credit_in_account_currency": self.total_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,
@ -85,8 +85,8 @@ class AssetRepair(Document):
gl_entry = frappe.get_doc({ gl_entry = frappe.get_doc({
"doctype": "GL Entry", "doctype": "GL Entry",
"account": repair_and_maintenance_account, "account": repair_and_maintenance_account,
"debit": self.repair_cost, "debit": self.total_repair_cost,
"debit_in_account_currency": self.repair_cost, "debit_in_account_currency": self.total_repair_cost,
"against": self.payable_account, "against": self.payable_account,
"voucher_type": self.doctype, "voucher_type": self.doctype,
"voucher_no": self.name, "voucher_no": self.name,
@ -95,39 +95,39 @@ class AssetRepair(Document):
}) })
gl_entry.insert() gl_entry.insert()
# if self.capitalize_repair_cost: if self.capitalize_repair_cost:
# fixed_asset_account = self.get_fixed_asset_account() fixed_asset_account = self.get_fixed_asset_account()
# gl_entry = frappe.get_doc({ gl_entry = frappe.get_doc({
# "doctype": "GL Entry", "doctype": "GL Entry",
# "account": self.payable_account, "account": self.payable_account,
# "credit": self.total_repair_cost, "credit": self.total_repair_cost,
# "credit_in_account_currency": self.repair_cost, "credit_in_account_currency": self.total_repair_cost,
# "against": repair_and_maintenance_account, "against": repair_and_maintenance_account,
# "voucher_type": self.doctype, "voucher_type": "Asset",
# "voucher_no": self.name, "voucher_no": self.asset,
# "cost_center": self.cost_center, "cost_center": self.cost_center,
# "posting_date": getdate() "posting_date": getdate()
# }) })
# gl_entry.insert() gl_entry.insert()
# gl_entry = frappe.get_doc({ gl_entry = frappe.get_doc({
# "doctype": "GL Entry", "doctype": "GL Entry",
# "account": fixed_asset_account, "account": fixed_asset_account,
# "debit": self.total_repair_cost, "debit": self.total_repair_cost,
# "debit_in_account_currency": self.repair_cost, "debit_in_account_currency": self.total_repair_cost,
# "against": self.payable_account, "against": self.payable_account,
# "voucher_type": self.doctype, "voucher_type": "Asset",
# "voucher_no": self.name, "voucher_no": self.asset,
# "cost_center": self.cost_center, "cost_center": self.cost_center,
# "posting_date": getdate() "posting_date": getdate()
# }) })
# gl_entry.insert() gl_entry.insert()
# def get_fixed_asset_account(self): def get_fixed_asset_account(self):
# asset_category = frappe.get_doc('Asset Category', frappe.db.get_value('Asset', self.asset, 'asset_category')) asset_category = frappe.get_doc('Asset Category', frappe.db.get_value('Asset', self.asset, 'asset_category'))
# company = frappe.db.get_value('Asset', self.asset, 'company') company = frappe.db.get_value('Asset', self.asset, 'company')
# for account in asset_category.accounts: for account in asset_category.accounts:
# if account.company_name == company: if account.company_name == company:
# return account.fixed_asset_account return account.fixed_asset_account
@frappe.whitelist() @frappe.whitelist()