fix: Make functions more readable
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 6a3db93..8ef5bcb 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -13,7 +13,7 @@
from erpnext.stock.doctype.delivery_note.delivery_note import update_billed_amount_based_on_so
from erpnext.projects.doctype.timesheet.timesheet import get_projectwise_timesheet_data
from erpnext.assets.doctype.asset.depreciation \
- import get_disposal_account_and_cost_center, get_gl_entries_on_asset_disposal_and_regain
+ import get_disposal_account_and_cost_center, get_gl_entries_on_asset_disposal, get_gl_entries_on_asset_regain
from erpnext.stock.doctype.batch.batch import set_batch_nos
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos, get_delivery_note_serial_no
from erpnext.setup.doctype.company.company import update_company_current_month_sales
@@ -930,11 +930,11 @@
.format(item.item_code, item.idx))
if self.is_return:
- fixed_asset_gl_entries = get_gl_entries_on_asset_disposal_and_regain(asset,
- item.base_net_amount, item.finance_book, True)
+ fixed_asset_gl_entries = get_gl_entries_on_asset_regain(asset,
+ item.base_net_amount, item.finance_book)
asset.db_set("disposal_date", None)
else:
- fixed_asset_gl_entries = get_gl_entries_on_asset_disposal_and_regain(asset,
+ fixed_asset_gl_entries = get_gl_entries_on_asset_disposal(asset,
item.base_net_amount, item.finance_book)
asset.db_set("disposal_date", self.posting_date)
diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
index 1d877a8..8fdbbf9 100644
--- a/erpnext/assets/doctype/asset/depreciation.py
+++ b/erpnext/assets/doctype/asset/depreciation.py
@@ -147,7 +147,7 @@
je.company = asset.company
je.remark = "Scrap Entry for asset {0}".format(asset_name)
- for entry in get_gl_entries_on_asset_disposal_and_regain(asset):
+ for entry in get_gl_entries_on_asset_disposal(asset):
entry.update({
"reference_type": "Asset",
"reference_name": asset_name
@@ -176,43 +176,10 @@
asset.set_status()
-@frappe.whitelist()
-def get_gl_entries_on_asset_disposal_and_regain(asset, selling_amount=0, finance_book=None, is_return = False):
- fixed_asset_account, accumulated_depr_account, depr_expense_account = get_depreciation_accounts(asset)
- disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(asset.company)
- depreciation_cost_center = asset.cost_center or depreciation_cost_center
+def get_gl_entries_on_asset_regain(asset, selling_amount=0, finance_book=None):
+ fixed_asset_account, asset, depreciation_cost_center, accumulated_depr_account, accumulated_depr_amount, disposal_account, value_after_depreciation = \
+ get_asset_details(asset, finance_book)
- idx = 1
- if finance_book:
- for d in asset.finance_books:
- if d.finance_book == finance_book:
- idx = d.idx
- break
-
- value_after_depreciation = (asset.finance_books[idx - 1].value_after_depreciation
- if asset.calculate_depreciation else asset.value_after_depreciation)
- accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(value_after_depreciation)
-
- if is_return:
- gl_entries = get_gl_entries_on_asset_regain(fixed_asset_account, asset, depreciation_cost_center, accumulated_depr_account, accumulated_depr_amount)
- profit_amount = abs(flt(value_after_depreciation)) - abs(flt(selling_amount))
-
- else:
- gl_entries = get_gl_entries_on_asset_disposal(fixed_asset_account, asset, depreciation_cost_center, accumulated_depr_account, accumulated_depr_amount)
- profit_amount = flt(selling_amount) - flt(value_after_depreciation)
-
- if profit_amount:
- debit_or_credit = "debit" if profit_amount < 0 else "credit"
- gl_entries.append({
- "account": disposal_account,
- "cost_center": depreciation_cost_center,
- debit_or_credit: abs(profit_amount),
- debit_or_credit + "_in_account_currency": abs(profit_amount)
- })
-
- return gl_entries
-
-def get_gl_entries_on_asset_regain(fixed_asset_account, asset, depreciation_cost_center, accumulated_depr_account, accumulated_depr_amount):
gl_entries = [
{
"account": fixed_asset_account,
@@ -228,9 +195,16 @@
}
]
+ profit_amount = abs(flt(value_after_depreciation)) - abs(flt(selling_amount))
+ if profit_amount:
+ get_profit_gl_entries(profit_amount, gl_entries, disposal_account, depreciation_cost_center)
+
return gl_entries
-def get_gl_entries_on_asset_disposal(fixed_asset_account, asset, depreciation_cost_center, accumulated_depr_account, accumulated_depr_amount):
+def get_gl_entries_on_asset_disposal(asset, selling_amount=0, finance_book=None):
+ fixed_asset_account, asset, depreciation_cost_center, accumulated_depr_account, accumulated_depr_amount, disposal_account, value_after_depreciation = \
+ get_asset_details(asset, finance_book)
+
gl_entries = [
{
"account": fixed_asset_account,
@@ -246,8 +220,39 @@
}
]
+ profit_amount = flt(selling_amount) - flt(value_after_depreciation)
+ if profit_amount:
+ get_profit_gl_entries(profit_amount, gl_entries, disposal_account, depreciation_cost_center)
+
return gl_entries
+def get_asset_details(asset, finance_book=None):
+ fixed_asset_account, accumulated_depr_account, depr_expense_account = get_depreciation_accounts(asset)
+ disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(asset.company)
+ depreciation_cost_center = asset.cost_center or depreciation_cost_center
+
+ idx = 1
+ if finance_book:
+ for d in asset.finance_books:
+ if d.finance_book == finance_book:
+ idx = d.idx
+ break
+
+ value_after_depreciation = (asset.finance_books[idx - 1].value_after_depreciation
+ if asset.calculate_depreciation else asset.value_after_depreciation)
+ accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(value_after_depreciation)
+
+ return fixed_asset_account, asset, depreciation_cost_center, accumulated_depr_account, accumulated_depr_amount, disposal_account, value_after_depreciation
+
+def get_profit_gl_entries(profit_amount, gl_entries, disposal_account, depreciation_cost_center):
+ debit_or_credit = "debit" if profit_amount < 0 else "credit"
+ gl_entries.append({
+ "account": disposal_account,
+ "cost_center": depreciation_cost_center,
+ debit_or_credit: abs(profit_amount),
+ debit_or_credit + "_in_account_currency": abs(profit_amount)
+ })
+
@frappe.whitelist()
def get_disposal_account_and_cost_center(company):
disposal_account, depreciation_cost_center = frappe.get_cached_value('Company', company,