nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fixing conflict

Browse Source
This commit is contained in:
anandbaburajan
2023-02-17 16:29:09 +05:30
parent 922b30a566
commit 3585b90ce5
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -707,24 +707,6 @@ class Asset(AccountsController):
if d.finance_book == self.default_finance_book: if d.finance_book == self.default_finance_book:
return cint(d.idx) - 1 return cint(d.idx) - 1
@frappe.whitelist()
def get_manual_depreciation_entries(self):
(_, _, depreciation_expense_account) = get_depreciation_accounts(self)
gle = frappe.qb.DocType("GL Entry")
records = (
frappe.qb.from_(gle)
.select(gle.voucher_no.as_("name"), gle.debit.as_("value"), gle.posting_date)
.where(gle.against_voucher == self.name)
.where(gle.account == depreciation_expense_account)
.where(gle.debit != 0)
.where(gle.is_cancelled == 0)
.orderby(gle.posting_date)
).run(as_dict=True)
return records
def validate_make_gl_entry(self): def validate_make_gl_entry(self):
purchase_document = self.get_purchase_document() purchase_document = self.get_purchase_document()
if not purchase_document: if not purchase_document:
@@ -842,8 +824,6 @@ class Asset(AccountsController):
self.db_set("booked_fixed_asset", 1) self.db_set("booked_fixed_asset", 1)
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
=======
def get_manual_depreciation_entries(self): def get_manual_depreciation_entries(self):
(_, _, depreciation_expense_account) = get_depreciation_accounts(self) (_, _, depreciation_expense_account) = get_depreciation_accounts(self)
@@ -863,7 +843,6 @@ class Asset(AccountsController):
return records return records
@frappe.whitelist() @frappe.whitelist()
>>>>>>> 03f07a20e7 (fix: asset repair status after deletion and asset status after manual depr entry)
def get_depreciation_rate(self, args, on_validate=False): def get_depreciation_rate(self, args, on_validate=False):
if isinstance(args, string_types): if isinstance(args, string_types):
args = json.loads(args) args = json.loads(args)