mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-24 23:49:19 +00:00
refactor: set_income_account_for_fixed_assets
This commit is contained in:
@@ -28,7 +28,6 @@ from erpnext.accounts.party import get_due_date, get_party_account, get_party_de
|
|||||||
from erpnext.accounts.utils import cancel_exchange_gain_loss_journal, get_account_currency
|
from erpnext.accounts.utils import cancel_exchange_gain_loss_journal, get_account_currency
|
||||||
from erpnext.assets.doctype.asset.depreciation import (
|
from erpnext.assets.doctype.asset.depreciation import (
|
||||||
depreciate_asset,
|
depreciate_asset,
|
||||||
get_disposal_account_and_cost_center,
|
|
||||||
get_gl_entries_on_asset_disposal,
|
get_gl_entries_on_asset_disposal,
|
||||||
get_gl_entries_on_asset_regain,
|
get_gl_entries_on_asset_regain,
|
||||||
reset_depreciation_schedule,
|
reset_depreciation_schedule,
|
||||||
@@ -1118,17 +1117,8 @@ class SalesInvoice(SellingController):
|
|||||||
return warehouse
|
return warehouse
|
||||||
|
|
||||||
def set_income_account_for_fixed_assets(self):
|
def set_income_account_for_fixed_assets(self):
|
||||||
disposal_account = depreciation_cost_center = None
|
for item in self.items:
|
||||||
for d in self.get("items"):
|
item.set_income_account_for_fixed_asset(self.company)
|
||||||
if d.is_fixed_asset:
|
|
||||||
if not disposal_account:
|
|
||||||
disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(
|
|
||||||
self.company
|
|
||||||
)
|
|
||||||
|
|
||||||
d.income_account = disposal_account
|
|
||||||
if not d.cost_center:
|
|
||||||
d.cost_center = depreciation_cost_center
|
|
||||||
|
|
||||||
def check_prev_docstatus(self):
|
def check_prev_docstatus(self):
|
||||||
for d in self.get("items"):
|
for d in self.get("items"):
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import frappe
|
|||||||
from frappe import _
|
from frappe import _
|
||||||
from frappe.model.document import Document
|
from frappe.model.document import Document
|
||||||
|
|
||||||
|
from erpnext.assets.doctype.asset.depreciation import get_disposal_account_and_cost_center
|
||||||
|
|
||||||
|
|
||||||
class SalesInvoiceItem(Document):
|
class SalesInvoiceItem(Document):
|
||||||
# begin: auto-generated types
|
# begin: auto-generated types
|
||||||
@@ -111,3 +113,14 @@ class SalesInvoiceItem(Document):
|
|||||||
)
|
)
|
||||||
or 0
|
or 0
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def set_income_account_for_fixed_asset(self, company: str):
|
||||||
|
"""Set income account for fixed asset item based on company's disposal account and cost center."""
|
||||||
|
if not self.is_fixed_asset:
|
||||||
|
return
|
||||||
|
|
||||||
|
disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(company)
|
||||||
|
|
||||||
|
self.income_account = disposal_account
|
||||||
|
if not self.cost_center:
|
||||||
|
self.cost_center = depreciation_cost_center
|
||||||
|
|||||||
Reference in New Issue
Block a user