nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Merge conflicts

Browse Source
This commit is contained in:
Ganga Manoj
2022-01-12 14:05:09 +05:30
committed by GitHub
parent d000782de0
commit 852543cbcd
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/assets/doctype/asset/asset.py
View File

@@ -192,14 +192,8 @@ class Asset(AccountsController):
self.validate_asset_finance_books(finance_book) self.validate_asset_finance_books(finance_book)
# value_after_depreciation - current Asset value # value_after_depreciation - current Asset value
<<<<<<< HEAD
if self.docstatus == 1 and d.value_after_depreciation:
value_after_depreciation = flt(d.value_after_depreciation)
=======
if self.docstatus == 1 and finance_book.value_after_depreciation: if self.docstatus == 1 and finance_book.value_after_depreciation:
value_after_depreciation = (flt(finance_book.value_after_depreciation) - value_after_depreciation = flt(finance_book.value_after_depreciation)
flt(self.opening_accumulated_depreciation))
>>>>>>> 059d1f3b74 (fix: Rename loop variable)
else: else:
value_after_depreciation = (flt(self.gross_purchase_amount) - value_after_depreciation = (flt(self.gross_purchase_amount) -
flt(self.opening_accumulated_depreciation)) flt(self.opening_accumulated_depreciation))
@@ -248,15 +242,9 @@ class Asset(AccountsController):
break break
# For first row # For first row
<<<<<<< HEAD
if has_pro_rata and not self.opening_accumulated_depreciation and n==0: if has_pro_rata and not self.opening_accumulated_depreciation and n==0:
depreciation_amount, days, months = self.get_pro_rata_amt(d, depreciation_amount,
self.available_for_use_date, d.depreciation_start_date)
=======
if has_pro_rata and n==0:
depreciation_amount, days, months = self.get_pro_rata_amt(finance_book, depreciation_amount, depreciation_amount, days, months = self.get_pro_rata_amt(finance_book, depreciation_amount,
self.available_for_use_date, finance_book.depreciation_start_date) self.available_for_use_date, finance_book.depreciation_start_date)
>>>>>>> 059d1f3b74 (fix: Rename loop variable)
# For first depr schedule date will be the start date # For first depr schedule date will be the start date
# so monthly schedule date is calculated by removing month difference between use date and start date # so monthly schedule date is calculated by removing month difference between use date and start date
@@ -267,11 +255,7 @@ class Asset(AccountsController):
if not self.flags.increase_in_asset_life: if not self.flags.increase_in_asset_life:
# In case of increase_in_asset_life, the self.to_date is already set on asset_repair submission # In case of increase_in_asset_life, the self.to_date is already set on asset_repair submission
self.to_date = add_months(self.available_for_use_date, self.to_date = add_months(self.available_for_use_date,
<<<<<<< HEAD (n + self.number_of_depreciations_booked) * cint(finance_book.frequency_of_depreciation))
(n + self.number_of_depreciations_booked) * cint(d.frequency_of_depreciation))
=======
n * cint(finance_book.frequency_of_depreciation))
>>>>>>> 059d1f3b74 (fix: Rename loop variable)
depreciation_amount_without_pro_rata = depreciation_amount depreciation_amount_without_pro_rata = depreciation_amount