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

Merge pull request #34111 from AnandBaburajan/asset_fixes_17_feb

Browse Source 
fix: repair status after deletion, asset status after manual depr entry and other misc bugs [develop]
This commit is contained in:
Anand Baburajan 2023-02-17 16:12:45 +05:30 committed by GitHub
commit 6b3028d77b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@ -238,21 +238,16 @@ class JournalEntry(AccountsController):
): ):
processed_assets.append(d.reference_name) processed_assets.append(d.reference_name)
asset = frappe.db.get_value( asset = frappe.get_doc("Asset", d.reference_name)
"Asset", d.reference_name, ["calculate_depreciation", "value_after_depreciation"], as_dict=1
)
if asset.calculate_depreciation: if asset.calculate_depreciation:
continue continue
depr_value = d.debit or d.credit depr_value = d.debit or d.credit
frappe.db.set_value( asset.db_set("value_after_depreciation", asset.value_after_depreciation - depr_value)
"Asset",
d.reference_name, asset.set_status()
"value_after_depreciation",
asset.value_after_depreciation - depr_value,
)
def update_inter_company_jv(self): def update_inter_company_jv(self):
if ( if (
@ -348,12 +343,9 @@ class JournalEntry(AccountsController):
else: else:
depr_value = d.debit or d.credit depr_value = d.debit or d.credit
frappe.db.set_value( asset.db_set("value_after_depreciation", asset.value_after_depreciation + depr_value)
"Asset",
d.reference_name, asset.set_status()
"value_after_depreciation",
asset.value_after_depreciation + depr_value,
)
def unlink_inter_company_jv(self): def unlink_inter_company_jv(self):
if ( if (

2
erpnext/assets/doctype/asset/asset.js
View File

@ -258,7 +258,7 @@ frappe.ui.form.on('Asset', {
$.each(depr_entries || [], function(i, v) { $.each(depr_entries || [], function(i, v) {
x_intervals.push(frappe.format(v.posting_date, { fieldtype: 'Date' })); x_intervals.push(frappe.format(v.posting_date, { fieldtype: 'Date' }));
let last_asset_value = asset_values[asset_values.length - 1] let last_asset_value = asset_values[asset_values.length - 1]
asset_values.push(last_asset_value - v.value); asset_values.push(flt(last_asset_value - v.value, precision('gross_purchase_amount')));
}); });
} }

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

@ -413,11 +413,14 @@ class Asset(AccountsController):
if self.journal_entry_for_scrap: if self.journal_entry_for_scrap:
status = "Scrapped" status = "Scrapped"
elif self.finance_books: else:
idx = self.get_default_finance_book_idx() or 0 expected_value_after_useful_life = 0
value_after_depreciation = self.value_after_depreciation
expected_value_after_useful_life = self.finance_books[idx].expected_value_after_useful_life if self.calculate_depreciation:
value_after_depreciation = self.finance_books[idx].value_after_depreciation idx = self.get_default_finance_book_idx() or 0
expected_value_after_useful_life = self.finance_books[idx].expected_value_after_useful_life
value_after_depreciation = self.finance_books[idx].value_after_depreciation
if flt(value_after_depreciation) <= expected_value_after_useful_life: if flt(value_after_depreciation) <= expected_value_after_useful_life:
status = "Fully Depreciated" status = "Fully Depreciated"
@ -463,6 +466,7 @@ class Asset(AccountsController):
.where(gle.debit != 0) .where(gle.debit != 0)
.where(gle.is_cancelled == 0) .where(gle.is_cancelled == 0)
.orderby(gle.posting_date) .orderby(gle.posting_date)
.orderby(gle.creation)
).run(as_dict=True) ).run(as_dict=True)
return records return records

2
erpnext/assets/doctype/asset/depreciation.py
View File

@ -168,7 +168,7 @@ def make_depreciation_entry(asset_depr_schedule_name, date=None):
row.value_after_depreciation -= d.depreciation_amount row.value_after_depreciation -= d.depreciation_amount
row.db_update() row.db_update()
frappe.db.set_value("Asset", asset_name, "depr_entry_posting_status", "Successful") asset.db_set("depr_entry_posting_status", "Successful")
asset.set_status() asset.set_status()

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

@ -91,6 +91,9 @@ class AssetRepair(AccountsController):
make_new_active_asset_depr_schedules_and_cancel_current_ones(self.asset_doc, notes) make_new_active_asset_depr_schedules_and_cancel_current_ones(self.asset_doc, notes)
self.asset_doc.save() self.asset_doc.save()
def after_delete(self):
frappe.get_doc("Asset", self.asset).set_status()
def check_repair_status(self): def check_repair_status(self):
if self.repair_status == "Pending": if self.repair_status == "Pending":
frappe.throw(_("Please update Repair Status.")) frappe.throw(_("Please update Repair Status."))