diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index dc52820..6a3db93 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_movement
+	import get_disposal_account_and_cost_center, get_gl_entries_on_asset_disposal_and_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_movement(asset,
+						fixed_asset_gl_entries = get_gl_entries_on_asset_disposal_and_regain(asset,
 							item.base_net_amount, item.finance_book, True)
 						asset.db_set("disposal_date", None)
 					else:
-						fixed_asset_gl_entries = get_gl_entries_on_asset_movement(asset,
+						fixed_asset_gl_entries = get_gl_entries_on_asset_disposal_and_regain(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 a18f427..1d877a8 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_movement(asset):
+	for entry in get_gl_entries_on_asset_disposal_and_regain(asset):
 		entry.update({
 			"reference_type": "Asset",
 			"reference_name": asset_name
@@ -177,7 +177,7 @@
 	asset.set_status()
 
 @frappe.whitelist()
-def get_gl_entries_on_asset_movement(asset, selling_amount=0, finance_book=None, is_return = False):
+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
