From 315724312bce4daac60f2b1d69f95b71478a693d Mon Sep 17 00:00:00 2001 From: sergiocorato Date: Mon, 19 Jun 2023 15:33:34 +0200 Subject: [PATCH] [14.0][FIX] assets_management: includere nella stampa cespiti non ancora ammortizzati --- assets_management/report/asset_journal.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/assets_management/report/asset_journal.py b/assets_management/report/asset_journal.py index 56c61f7c1f58..8fcf8cf073ce 100644 --- a/assets_management/report/asset_journal.py +++ b/assets_management/report/asset_journal.py @@ -164,7 +164,7 @@ def generate_structure(self): dep_lines = dep_lines.filtered(lambda dl: dl.date <= self.date) categories = assets.mapped("category_id") - if not (categories and assets and deps and dep_lines): + if not (categories and assets and deps): raise ValidationError( _("There is nothing to print according to current settings!") ) @@ -346,8 +346,16 @@ def generate_totals(self): t: {fname: 0 for fname in fnames} for t in report_deps.mapped("depreciation_id.type_id") } - for report_dep in report_deps.filtered("report_depreciation_year_line_ids"): + for report_dep in report_deps: dep_type = report_dep.depreciation_id.type_id + if not report_dep.report_depreciation_year_line_ids: + totals_by_dep_type[dep_type][ + "amount_depreciable_updated" + ] += report_dep.dep_amount_depreciable + totals_by_dep_type[dep_type][ + "amount_residual" + ] += report_dep.dep_amount_depreciable + continue last_line = report_dep.report_depreciation_year_line_ids[-1] line_curr = last_line.get_currency() fy_start = last_line.fiscal_year_id.date_from