Browse Source

Merge PR #638 into 12.0

Signed-off-by pedrobaeza
pull/644/head
OCA-git-bot 5 years ago
parent
commit
7eb4aaadf5
  1. 2
      mis_builder_cash_flow/__manifest__.py
  2. 7
      mis_builder_cash_flow/report/mis_cash_flow.py

2
mis_builder_cash_flow/__manifest__.py

@ -3,7 +3,7 @@
{ {
'name': 'MIS Builder Cash Flow', 'name': 'MIS Builder Cash Flow',
'version': '12.0.1.1.0',
'version': '12.0.1.2.0',
'license': 'LGPL-3', 'license': 'LGPL-3',
'author': 'ADHOC SA, ' 'author': 'ADHOC SA, '
'Odoo Community Association (OCA)', 'Odoo Community Association (OCA)',

7
mis_builder_cash_flow/report/mis_cash_flow.py

@ -66,6 +66,8 @@ class MisCashFlow(models.Model):
@api.model_cr @api.model_cr
def init(self): def init(self):
account_type_receivable = self.env.ref(
'account.data_account_type_receivable')
query = """ query = """
SELECT SELECT
-- we use negative id to avoid duplicates and we don't use -- we use negative id to avoid duplicates and we don't use
@ -110,12 +112,11 @@ class MisCashFlow(models.Model):
Null as reconciled, Null as reconciled,
Null as full_reconcile_id, Null as full_reconcile_id,
fl.company_id as company_id, fl.company_id as company_id,
-- we dont need this field on forecast lines
Null as user_type_id,
%i as user_type_id,
fl.name as name, fl.name as name,
fl.date as date fl.date as date
FROM mis_cash_flow_forecast_line as fl FROM mis_cash_flow_forecast_line as fl
"""
""" % account_type_receivable.id
tools.drop_view_if_exists(self.env.cr, self._table) tools.drop_view_if_exists(self.env.cr, self._table)
self._cr.execute( self._cr.execute(
'CREATE OR REPLACE VIEW %s AS %s', 'CREATE OR REPLACE VIEW %s AS %s',

Loading…
Cancel
Save