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

fix init flag when computing depreciation board

Browse Source
This commit is contained in:
Luc De Meyer
2018-09-24 19:46:22 +02:00
committed by OCA-git-bot
parent b0da62b316
commit 52b284d038
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_asset_management/__manifest__.py
View File

@@ -4,7 +4,7 @@
{
'name': 'Assets Management',
'version': '10.0.3.0.2',
'version': '10.0.3.0.3',
'license': 'AGPL-3',
'depends': [
'account_fiscal_year',

11
account_asset_management/models/account_asset.py
View File

@@ -895,7 +895,7 @@ class AccountAsset(models.Model):
asset_date_start = datetime.strptime(self.date_start, '%Y-%m-%d')
fy = company.find_daterange_fy(asset_date_start)
fiscalyear_lock_date = company.fiscalyear_lock_date
if fiscalyear_lock_date > self.date_start:
if fiscalyear_lock_date >= self.date_start:
init_flag = True
if fy:
fy_id = fy.id
@@ -950,12 +950,17 @@ class AccountAsset(models.Model):
fy_date_start = fy_date_stop + relativedelta(days=1)
fy = company.find_daterange_fy(fy_date_start)
if fy:
if fiscalyear_lock_date > fy.date_end:
if fiscalyear_lock_date >= fy.date_end:
init_flag = True
else:
init_flag = False
fy_date_stop = datetime.strptime(fy.date_end, '%Y-%m-%d')
else:
fy_date_stop = fy_date_stop + relativedelta(years=1)
if fiscalyear_lock_date >= fy_date_stop.strftime('%Y-%m-%d'):
init_flag = True
else:
init_flag = False
# Step 1:
# Calculate depreciation amount per fiscal year.
# This is calculation is skipped for method_time != 'year'.