|
@ -6,7 +6,7 @@ class MisCashFlow(models.Model): |
|
|
|
|
|
|
|
|
_inherit = 'mis.cash_flow' |
|
|
_inherit = 'mis.cash_flow' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
active = fields.Boolean(default=True) |
|
|
analytic_account_id = fields.Many2one( |
|
|
analytic_account_id = fields.Many2one( |
|
|
comodel_name='account.analytic.account', |
|
|
comodel_name='account.analytic.account', |
|
|
string='Analytic Account', |
|
|
string='Analytic Account', |
|
@ -37,7 +37,8 @@ class MisCashFlow(models.Model): |
|
|
aml.company_id as company_id, |
|
|
aml.company_id as company_id, |
|
|
aml.user_type_id as user_type_id, |
|
|
aml.user_type_id as user_type_id, |
|
|
aml.name as name, |
|
|
aml.name as name, |
|
|
aml.date_maturity as date |
|
|
|
|
|
|
|
|
aml.date_maturity as date, |
|
|
|
|
|
1 as active |
|
|
FROM account_move_line as aml |
|
|
FROM account_move_line as aml |
|
|
UNION ALL |
|
|
UNION ALL |
|
|
SELECT |
|
|
SELECT |
|
@ -45,6 +46,7 @@ class MisCashFlow(models.Model): |
|
|
CAST('forecast_line' AS varchar) as line_type, |
|
|
CAST('forecast_line' AS varchar) as line_type, |
|
|
Null as move_line_id, |
|
|
Null as move_line_id, |
|
|
fl.account_id as account_id, |
|
|
fl.account_id as account_id, |
|
|
|
|
|
fl.active as active, |
|
|
fl.analytic_account_id as analytic_account_id, |
|
|
fl.analytic_account_id as analytic_account_id, |
|
|
CASE |
|
|
CASE |
|
|
WHEN fl.balance > 0 |
|
|
WHEN fl.balance > 0 |
|
|