From 4c617b86f3d89abd2b739a52a89e2f8e7f14e0e1 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Mon, 1 Oct 2018 16:31:43 +0200 Subject: [PATCH] align with 11.0 port --- account_asset_management/models/account_asset.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/account_asset_management/models/account_asset.py b/account_asset_management/models/account_asset.py index ba110a9fd..8320ed480 100644 --- a/account_asset_management/models/account_asset.py +++ b/account_asset_management/models/account_asset.py @@ -902,7 +902,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 and fiscalyear_lock_date >= self.date_start: init_flag = True if fy: fy_id = fy.id @@ -957,14 +957,20 @@ 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 and + 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'): + if ( + fiscalyear_lock_date and + fiscalyear_lock_date >= fy.date_end + ): init_flag = True else: init_flag = False