audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #1282 into 13.0

Browse Source 
Signed-off-by joao-p-marques
This commit is contained in:
OCA-git-bot
2021-12-15 13:27:48 +00:00
parent 03efb2223b b675ba563a
commit db2784a820
2 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
account_asset_management/models/account_asset.py
View File

@@ -688,9 +688,16 @@ class AccountAsset(models.Model):
# recompute in case of deviation
depreciated_value_posted = depreciated_value = 0.0
if posted_lines:
total_table_lines = sum([len(entry["lines"]) for entry in table])
move_check_lines = asset.depreciation_line_ids.filtered("move_check")
last_depreciation_date = last_line.line_date
last_date_in_table = table[-1]["lines"][-1]["date"]
if last_date_in_table <= last_depreciation_date:
# If the number of lines in the table is the same as the depreciation
# lines, we will not show an error even if the dates are the same.
if (last_date_in_table < last_depreciation_date) or (
last_date_in_table == last_depreciation_date
and total_table_lines != len(move_check_lines)
):
raise UserError(
_(
"The duration of the asset conflicts with the "
@@ -731,6 +738,17 @@ class AccountAsset(models.Model):
residual_amount = asset.depreciation_base - depreciated_value
amount_diff = round(residual_amount_table - residual_amount, digits)
if amount_diff:
# We will auto-create a new line because the number of lines in
# the tables are the same as the posted depreciations and there
# is still a residual value. Only in this case we will need to
# add a new line to the table with the amount of the difference.
if len(move_check_lines) == total_table_lines:
table[table_i_start]["lines"].append(
table[table_i_start]["lines"][line_i_start - 1]
)
line = table[table_i_start]["lines"][line_i_start]
line["days"] = 0
line["amount"] = amount_diff
# compensate in first depreciation entry
# after last posting
line = table[table_i_start]["lines"][line_i_start]

35
account_asset_management/tests/test_account_asset_management.py
View File

@@ -866,3 +866,38 @@ class TestAssetManagement(SavepointCase):
self.assertEqual(ict0.value_residual, 1500)
move = self.env["account.move"].search([("id", "=", original_move_id)])
self.assertFalse(move)
def test_20_asset_removal_with_value_residual(self):
"""Asset removal with value residual"""
asset = self.asset_model.create(
{
"name": "test asset removal",
"profile_id": self.ref(
"account_asset_management." "account_asset_profile_car_5Y"
),
"purchase_value": 1000,
"salvage_value": 0,
"date_start": "2019-01-01",
"method_time": "number",
"method_number": 10,
"method_period": "month",
"prorata": False,
}
)
asset.compute_depreciation_board()
asset.validate()
lines = asset.depreciation_line_ids.filtered(lambda x: not x.init_entry)
self.assertEqual(len(lines), 10)
last_line = lines[-1]
last_line["amount"] = last_line["amount"] - 0.10
for asset_line in lines:
asset_line.create_move()
self.assertEqual(asset.value_residual, 0.10)
asset.compute_depreciation_board()
lines = asset.depreciation_line_ids.filtered(lambda x: not x.init_entry)
self.assertEqual(len(lines), 11)
last_line = lines[-1]
self.assertEqual(last_line.amount, 0.10)
last_line.create_move()
self.assertEqual(asset.value_residual, 0)
self.assertEqual(asset.state, "close")