nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-21 02:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(asset-invoice): handle asset invoice cancellation

Browse Source
This commit is contained in:
Bhavan23
2025-06-18 10:54:24 +05:30
parent 79a9d583d9
commit d3daeaf475
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -1356,7 +1356,9 @@ class SalesInvoice(SellingController):
if item.is_fixed_asset: if item.is_fixed_asset:
asset = self.get_asset(item) asset = self.get_asset(item)
if self.is_return: if (self.docstatus == 2 and not self.is_return) or (
self.docstatus == 1 and self.is_return
):
fixed_asset_gl_entries = get_gl_entries_on_asset_regain( fixed_asset_gl_entries = get_gl_entries_on_asset_regain(
asset, asset,
item.base_net_amount, item.base_net_amount,
@@ -1369,8 +1371,10 @@ class SalesInvoice(SellingController):
add_asset_activity(asset.name, _("Asset returned")) add_asset_activity(asset.name, _("Asset returned"))
if asset.calculate_depreciation: if asset.calculate_depreciation:
posting_date = frappe.db.get_value( posting_date = (
"Sales Invoice", self.return_against, "posting_date" frappe.db.get_value("Sales Invoice", self.return_against, "posting_date")
if self.is_return
else self.posting_date
) )
reverse_depreciation_entry_made_after_disposal(asset, posting_date) reverse_depreciation_entry_made_after_disposal(asset, posting_date)
notes = _( notes = _(
@@ -1467,8 +1471,10 @@ class SalesInvoice(SellingController):
return self._enable_discount_accounting return self._enable_discount_accounting
def set_asset_status(self, asset): def set_asset_status(self, asset):
if self.is_return: if self.is_return and not self.docstatus == 2:
asset.set_status() asset.set_status()
elif self.is_return and self.docstatus == 2:
asset.set_status("Sold")
else: else:
asset.set_status("Sold" if self.docstatus == 1 else None) asset.set_status("Sold" if self.docstatus == 1 else None)