nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-04 22:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor by just using a filter

Browse Source 
(cherry picked from commit 6b21deedae)
This commit is contained in:
anandbaburajan
2022-09-29 15:37:04 +05:30
committed by Mergify
parent bc21ce412b
commit 4afd2b7470
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -643,15 +643,13 @@ class Asset(AccountsController):
self.db_set("status", status) self.db_set("status", status)
def get_status(self): def get_status(self):
"""Returns status based on whether it is draft, submitted, sold, scrapped or depreciated""" """Returns status based on whether it is draft, submitted, scrapped or depreciated"""
if self.docstatus == 0: if self.docstatus == 0:
status = "Draft" status = "Draft"
elif self.docstatus == 1: elif self.docstatus == 1:
status = "Submitted" status = "Submitted"
if self.is_sold(): if self.journal_entry_for_scrap:
status = "Sold"
elif self.journal_entry_for_scrap:
status = "Scrapped" status = "Scrapped"
elif self.finance_books: elif self.finance_books:
idx = self.get_default_finance_book_idx() or 0 idx = self.get_default_finance_book_idx() or 0
@@ -667,21 +665,6 @@ class Asset(AccountsController):
status = "Cancelled" status = "Cancelled"
return status return status
def is_sold(self):
item = frappe.qb.DocType("Sales Invoice Item").as_("item")
si = frappe.qb.DocType("Sales Invoice").as_("si")
asset_sales_invoice = (
frappe.qb.from_(item)
.select(item.parent)
.inner_join(si)
.on(item.parent == si.name)
.where(item.asset == self.name)
.where(si.docstatus == 1)
).run()
return True if asset_sales_invoice else False
def get_default_finance_book_idx(self): def get_default_finance_book_idx(self):
if not self.get("default_finance_book") and self.company: if not self.get("default_finance_book") and self.company:
self.default_finance_book = erpnext.get_default_finance_book(self.company) self.default_finance_book = erpnext.get_default_finance_book(self.company)
@@ -836,7 +819,9 @@ class Asset(AccountsController):
def update_maintenance_status(): def update_maintenance_status():
assets = frappe.get_all("Asset", filters={"docstatus": 1, "maintenance_required": 1}) assets = frappe.get_all(
"Asset", filters={"docstatus": 1, "maintenance_required": 1, "disposal_date": ("is", "not set")}
)
for asset in assets: for asset in assets:
asset = frappe.get_doc("Asset", asset.name) asset = frappe.get_doc("Asset", asset.name)