nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 04:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix merge conflicts

Browse Source
This commit is contained in:
anandbaburajan
2022-09-29 11:59:53 +05:30
parent f4648ed610
commit 381231257b
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/assets/doctype/asset/depreciation.py
View File

@@ -244,14 +244,6 @@ def restore_asset(asset_name):
asset.set_status() 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): def depreciate_asset(asset, date):
asset.flags.ignore_validate_update_after_submit = True asset.flags.ignore_validate_update_after_submit = True
asset.prepare_depreciation_data(date_of_disposal=date) asset.prepare_depreciation_data(date_of_disposal=date)
@@ -337,14 +329,9 @@ def disposal_happens_in_the_future(posting_date_of_disposal):
return False 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( def get_gl_entries_on_asset_regain(
asset, selling_amount=0, finance_book=None, voucher_type=None, voucher_no=None asset, selling_amount=0, finance_book=None, voucher_type=None, voucher_no=None
): ):
>>>>>>> c6a7de0e54 (chore: add blank lines)
( (
fixed_asset_account, fixed_asset_account,
asset, asset,