diff --git a/account_asset_management/account_asset.py b/account_asset_management/account_asset.py index de12154a..a0697deb 100644 --- a/account_asset_management/account_asset.py +++ b/account_asset_management/account_asset.py @@ -826,8 +826,8 @@ class account_asset_asset(orm.Model): for rec in record.child_ids: asset_value += \ rec.type == 'normal' and \ - self._asset_value_compute(cr, uid, rec, context) or \ - _value_get(rec) + self._asset_value_compute(cr, uid, rec, context) \ + or _value_get(rec) return asset_value res[asset.id] = _value_get(asset) return res diff --git a/account_asset_management/tests/test_account_asset_management.py b/account_asset_management/tests/test_account_asset_management.py index 70d1ca04..0ae7c60f 100644 --- a/account_asset_management/tests/test_account_asset_management.py +++ b/account_asset_management/tests/test_account_asset_management.py @@ -138,13 +138,20 @@ class TestAssetManagement(common.TransactionCase): self.asset_model.compute_depreciation_board( self.cr, self.uid, [asset.id]) asset.refresh() - self.assertEquals(asset.depreciation_line_ids[1].amount, 47.33) - self.assertEquals(asset.depreciation_line_ids[2].amount, 55.55) - self.assertEquals(asset.depreciation_line_ids[3].amount, 55.55) - self.assertEquals(asset.depreciation_line_ids[4].amount, 55.55) - self.assertEquals(asset.depreciation_line_ids[5].amount, 55.55) - self.assertEquals(asset.depreciation_line_ids[6].amount, 55.55) - self.assertEquals(asset.depreciation_line_ids[-1].amount, 8.22) + self.assertAlmostEqual(asset.depreciation_line_ids[1].amount, 47.33, + places=2) + self.assertAlmostEqual(asset.depreciation_line_ids[2].amount, 55.55, + places=2) + self.assertAlmostEqual(asset.depreciation_line_ids[3].amount, 55.55, + places=2) + self.assertAlmostEqual(asset.depreciation_line_ids[4].amount, 55.55, + places=2) + self.assertAlmostEqual(asset.depreciation_line_ids[5].amount, 55.55, + places=2) + self.assertAlmostEqual(asset.depreciation_line_ids[6].amount, 55.55, + places=2) + self.assertAlmostEqual(asset.depreciation_line_ids[-1].amount, 8.22, + places=2) def test_3_proprata_init_prev_year(self): """Prorata temporis depreciation with init value in prev year.""" @@ -174,11 +181,15 @@ class TestAssetManagement(common.TransactionCase): self.cr, self.uid, [asset.id]) asset.refresh() # I check the depreciated value is the initial value - self.assertEquals(asset.value_depreciated, 325.08) + self.assertAlmostEqual(asset.value_depreciated, 325.08, + places=2) # I check computed values in the depreciation board - self.assertEquals(asset.depreciation_line_ids[2].amount, 55.55) - self.assertEquals(asset.depreciation_line_ids[3].amount, 55.55) - self.assertEquals(asset.depreciation_line_ids[-1].amount, 8.22) + self.assertAlmostEqual(asset.depreciation_line_ids[2].amount, 55.55, + places=2) + self.assertAlmostEqual(asset.depreciation_line_ids[3].amount, 55.55, + places=2) + self.assertAlmostEqual(asset.depreciation_line_ids[-1].amount, 8.22, + places=2) def test_4_prorata_init_cur_year(self): """Prorata temporis depreciation with init value in curent year.""" @@ -206,8 +217,12 @@ class TestAssetManagement(common.TransactionCase): self.cr, self.uid, [asset.id]) asset.refresh() # I check the depreciated value is the initial value - self.assertEquals(asset.value_depreciated, 279.44) + self.assertAlmostEqual(asset.value_depreciated, 279.44, + places=2) # I check computed values in the depreciation board - self.assertEquals(asset.depreciation_line_ids[2].amount, 45.64) - self.assertEquals(asset.depreciation_line_ids[3].amount, 55.55) - self.assertEquals(asset.depreciation_line_ids[-1].amount, 8.22) + self.assertAlmostEqual(asset.depreciation_line_ids[2].amount, 45.64, + places=2) + self.assertAlmostEqual(asset.depreciation_line_ids[3].amount, 55.55, + places=2) + self.assertAlmostEqual(asset.depreciation_line_ids[-1].amount, 8.22, + places=2) diff --git a/account_asset_management/wizard/account_asset_remove.py b/account_asset_management/wizard/account_asset_remove.py index ff948ee9..b48b63e5 100644 --- a/account_asset_management/wizard/account_asset_remove.py +++ b/account_asset_management/wizard/account_asset_remove.py @@ -258,7 +258,8 @@ class account_asset_remove(orm.TransientModel): } move_lines.append((0, 0, move_line_vals)) balance = wiz_data.sale_value - residual_value - account_id = balance > 0 and wiz_data.account_plus_value_id.id \ + account_id = balance > 0 \ + and wiz_data.account_plus_value_id.id \ or wiz_data.account_min_value_id.id move_line_vals = { 'name': asset.name,