From e69d9b8b7df9d55ac8d8709d622c31fef9480a23 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Tue, 24 May 2016 14:38:31 +0200 Subject: [PATCH] [FIX] account_asset: fiscal year date The fiscal year start date should be taken into account when calculating the depreciation amount in case of prorata temporis. opw-678072 --- addons/account_asset/account_asset.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 69cafd5869b..96667d2ccf8 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -127,19 +127,15 @@ class AccountAssetAsset(models.Model): amount = amount_to_depr / (undone_dotation_number - len(posted_depreciation_line_ids)) if self.prorata and self.category_id.type == 'purchase': amount = amount_to_depr / self.method_number - days = total_days - float(depreciation_date.strftime('%j')) if sequence == 1: + days = (self.company_id.compute_fiscalyear_dates(depreciation_date)['date_to'] - depreciation_date).days + 1 amount = (amount_to_depr / self.method_number) / total_days * days - elif sequence == undone_dotation_number: - amount = (amount_to_depr / self.method_number) / total_days * (total_days - days) elif self.method == 'degressive': amount = residual_amount * self.method_progress_factor if self.prorata: - days = total_days - float(depreciation_date.strftime('%j')) if sequence == 1: + days = (self.company_id.compute_fiscalyear_dates(depreciation_date)['date_to'] - depreciation_date).days + 1 amount = (residual_amount * self.method_progress_factor) / total_days * days - elif sequence == undone_dotation_number: - amount = (residual_amount * self.method_progress_factor) / total_days * (total_days - days) return amount def _compute_board_undone_dotation_nb(self, depreciation_date, total_days):