From 381231257b0c83aec8baafb3af075a83e116577d Mon Sep 17 00:00:00 2001 From: anandbaburajan Date: Thu, 29 Sep 2022 11:59:53 +0530 Subject: [PATCH] chore: fix merge conflicts --- erpnext/assets/doctype/asset/depreciation.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py index f9a226f3734..97941706aa8 100644 --- a/erpnext/assets/doctype/asset/depreciation.py +++ b/erpnext/assets/doctype/asset/depreciation.py @@ -244,14 +244,6 @@ def restore_asset(asset_name): asset.set_status() -<<<<<<< HEAD -<<<<<<< HEAD -def get_gl_entries_on_asset_regain( - asset, selling_amount=0, finance_book=None, voucher_type=None, voucher_no=None -): -======= -======= ->>>>>>> c6a7de0e54 (chore: add blank lines) def depreciate_asset(asset, date): asset.flags.ignore_validate_update_after_submit = True asset.prepare_depreciation_data(date_of_disposal=date) @@ -337,14 +329,9 @@ def disposal_happens_in_the_future(posting_date_of_disposal): return False -<<<<<<< HEAD -def get_gl_entries_on_asset_regain(asset, selling_amount=0, finance_book=None): ->>>>>>> ff5cad1cd6 (fix: calculate depreciation properly on asset sale entry and scrap entry) -======= def get_gl_entries_on_asset_regain( asset, selling_amount=0, finance_book=None, voucher_type=None, voucher_no=None ): ->>>>>>> c6a7de0e54 (chore: add blank lines) ( fixed_asset_account, asset,