Yaltik/account-financial-tools
2
0
Fork 0
Code Pull Requests Activity

[FIX] calculate days when remove asset

Browse Source
This commit is contained in:
Saran440 2020-08-19 17:08:42 +07:00 committed by Rodrigo
parent 80bfe5b91b
commit d95641888f
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
account_asset_management/tests/test_account_asset_management.py
View File

@ -524,8 +524,8 @@ class TestAssetManagement(AccountTestInvoicingCommon):
wiz.remove() wiz.remove()
asset.refresh() asset.refresh()
self.assertEqual(len(asset.depreciation_line_ids), 3) self.assertEqual(len(asset.depreciation_line_ids), 3)
self.assertAlmostEqual(asset.depreciation_line_ids[1].amount, 81.46, places=2) self.assertAlmostEqual(asset.depreciation_line_ids[1].amount, 83.33, places=2)
self.assertAlmostEqual(asset.depreciation_line_ids[2].amount, 4918.54, places=2) self.assertAlmostEqual(asset.depreciation_line_ids[2].amount, 4916.67, places=2)
def test_09_asset_from_invoice(self): def test_09_asset_from_invoice(self):
all_asset = self.env["account.asset"].search([]) all_asset = self.env["account.asset"].search([])

16
account_asset_management/wizard/account_asset_remove.py
View File

@ -153,7 +153,11 @@ class AccountAssetRemove(models.TransientModel):
residual_value = asset.value_residual residual_value = asset.value_residual
dlines = asset_line_obj.search( dlines = asset_line_obj.search(
[("asset_id", "=", asset.id), ("type", "=", "depreciate")], [
("asset_id", "=", asset.id),
("type", "=", "depreciate"),
("move_check", "!=", False),
],
order="line_date desc", order="line_date desc",
) )
if dlines: if dlines:
@ -254,9 +258,9 @@ class AccountAssetRemove(models.TransientModel):
) )
last_depr_date = create_dl.line_date last_depr_date = create_dl.line_date
period_number_days = (first_date - last_depr_date).days period_number_days = (first_date - last_depr_date).days + 1
new_line_date = date_remove + relativedelta(days=-1) new_line_date = date_remove + relativedelta(days=-1)
to_depreciate_days = (new_line_date - last_depr_date).days to_depreciate_days = (new_line_date - last_depr_date).days + 1
to_depreciate_amount = round( to_depreciate_amount = round(
float(to_depreciate_days) float(to_depreciate_days)
/ float(period_number_days) / float(period_number_days)
@ -265,7 +269,11 @@ class AccountAssetRemove(models.TransientModel):
) )
residual_value = asset.value_residual - to_depreciate_amount residual_value = asset.value_residual - to_depreciate_amount
if to_depreciate_amount: if to_depreciate_amount:
update_vals = {"amount": to_depreciate_amount, "line_date": new_line_date} update_vals = {
"amount": to_depreciate_amount,
"line_date": new_line_date,
"line_days": to_depreciate_days,
}
first_to_depreciate_dl.write(update_vals) first_to_depreciate_dl.write(update_vals)
dlines[0].create_move() dlines[0].create_move()
dlines -= dlines[0] dlines -= dlines[0]