From 670cb051c11b2ccd0f6d7e8a8b878ba68d74d134 Mon Sep 17 00:00:00 2001 From: Nicolas JEUDY Date: Thu, 26 Aug 2021 05:39:50 +0000 Subject: [PATCH] [NEW] add active option --- .../models/mis_cash_flow_forecast_line.py | 1 + mis_builder_analytic_cash_flow/report/mis_cash_flow.py | 6 ++++-- .../views/mis_cash_flow_forecast_line_views.xml | 8 ++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mis_builder_analytic_cash_flow/models/mis_cash_flow_forecast_line.py b/mis_builder_analytic_cash_flow/models/mis_cash_flow_forecast_line.py index cc8ebc69..581e38aa 100644 --- a/mis_builder_analytic_cash_flow/models/mis_cash_flow_forecast_line.py +++ b/mis_builder_analytic_cash_flow/models/mis_cash_flow_forecast_line.py @@ -6,6 +6,7 @@ class MisCashFlowForecastLine(models.Model): _inherit = 'mis.cash_flow.forecast_line' + active = fields.Boolean(default=True) analytic_account_id = fields.Many2one( comodel_name='account.analytic.account', string='Analytic Account', diff --git a/mis_builder_analytic_cash_flow/report/mis_cash_flow.py b/mis_builder_analytic_cash_flow/report/mis_cash_flow.py index 286dc812..3f1153a1 100644 --- a/mis_builder_analytic_cash_flow/report/mis_cash_flow.py +++ b/mis_builder_analytic_cash_flow/report/mis_cash_flow.py @@ -6,7 +6,7 @@ class MisCashFlow(models.Model): _inherit = 'mis.cash_flow' - + active = fields.Boolean(default=True) analytic_account_id = fields.Many2one( comodel_name='account.analytic.account', string='Analytic Account', @@ -37,7 +37,8 @@ class MisCashFlow(models.Model): aml.company_id as company_id, aml.user_type_id as user_type_id, aml.name as name, - aml.date_maturity as date + aml.date_maturity as date, + 1 as active FROM account_move_line as aml UNION ALL SELECT @@ -45,6 +46,7 @@ class MisCashFlow(models.Model): CAST('forecast_line' AS varchar) as line_type, Null as move_line_id, fl.account_id as account_id, + fl.active as active, fl.analytic_account_id as analytic_account_id, CASE WHEN fl.balance > 0 diff --git a/mis_builder_analytic_cash_flow/views/mis_cash_flow_forecast_line_views.xml b/mis_builder_analytic_cash_flow/views/mis_cash_flow_forecast_line_views.xml index 8812d8e0..1678002f 100644 --- a/mis_builder_analytic_cash_flow/views/mis_cash_flow_forecast_line_views.xml +++ b/mis_builder_analytic_cash_flow/views/mis_cash_flow_forecast_line_views.xml @@ -8,7 +8,8 @@ - + + @@ -30,7 +31,10 @@ - + + + +