pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account_asset: fiscal year date

Browse Source 
The fiscal year start date should be taken into account when calculating
the depreciation amount in case of prorata temporis.

opw-678072
This commit is contained in:
Nicolas Martinelli
2016-05-24 15:36:54 +02:00
parent bb51431653
commit e69d9b8b7d
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_asset/account_asset.py
+2 -6
View File
@@ -127,19 +127,15 @@ class AccountAssetAsset(models.Model):
amount = amount_to_depr / (undone_dotation_number - len(posted_depreciation_line_ids)) amount = amount_to_depr / (undone_dotation_number - len(posted_depreciation_line_ids))
if self.prorata and self.category_id.type == 'purchase': if self.prorata and self.category_id.type == 'purchase':
amount = amount_to_depr / self.method_number amount = amount_to_depr / self.method_number
days = total_days - float(depreciation_date.strftime('%j'))
if sequence == 1: 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 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': elif self.method == 'degressive':
amount = residual_amount * self.method_progress_factor amount = residual_amount * self.method_progress_factor
if self.prorata: if self.prorata:
days = total_days - float(depreciation_date.strftime('%j'))
if sequence == 1: 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 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 return amount
def _compute_board_undone_dotation_nb(self, depreciation_date, total_days): def _compute_board_undone_dotation_nb(self, depreciation_date, total_days):