[MIG][11.0] mis_builder

Author: JordiBForgeFlow

.travis.yml

@@ -7,7 +7,7 @@ addons:
    packages:
       - expect-dev  # provides unbuffer utility
       - python-lxml # because pip installation is slow
-
+      - pdftk # required in reporting-engine repo
 
 language: python
 

README.md

@@ -7,8 +7,6 @@
 Management Information System reports for Odoo: easily build super fast,
 beautiful, custom reports such as P&L, Balance Sheets and more.
 
-**Odoo 11.0 is not supported yet, nothing to see here for now.**
-
 **This is the 11.0 branch. Please note the development of new features occurs mainly on
 the 10.0 branch, to be forward-ported to 11.0. Please submit pull requests to the 10.0
 branch in priority, unless they are 11.0 specific bugs, or they rely on

mis_builder/__manifest__.py

@@ -4,13 +4,12 @@
 
 {
     'name': 'MIS Builder',
-    'version': '10.0.3.1.1',
+    'version': '11.0.3.1.1',
     'category': 'Reporting',
     'summary': """
         Build 'Management Information System' Reports and Dashboards
     """,
-    'author': 'ACSONE SA/NV,'
-              'Odoo Community Association (OCA)',
+    'author': 'ACSONE SA/NV, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/mis-builder/',
     'depends': [
         'account',
@@ -29,11 +28,9 @@
         'security/mis_builder_security.xml',
         'report/mis_report_instance_qweb.xml',
         'report/mis_report_instance_xlsx.xml',
+        'views/mis_report_template.xml',
     ],
-    'qweb': [
-        'static/src/xml/*.xml'
-    ],
-    'installable': False,
+    'installable': True,
     'application': True,
     'license': 'AGPL-3',
 }

mis_builder/datas/ir_cron.xml

@@ -7,9 +7,8 @@
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
-            <field eval="'mis.report.instance'" name="model"/>
-            <field eval="'_vacuum_report'" name="function"/>
-            <field eval="'(24,)'" name="args"/>
+            <field ref="model_mis_report_instance" name="model_id"/>
+            <field name="code">model._vacuum_report(24, 0)</field>
             <field name="active" eval="True" />
         </record>
 

mis_builder/models/mis_kpi_data.py

@@ -41,16 +41,26 @@ class MisKpiData(models.AbstractModel):
     amount = fields.Float(
     )
     seq1 = fields.Integer(
-        related='kpi_expression_id.kpi_id.sequence',
-        store=True,
+        compute='_compute_seq',
         readonly=True,
     )
     seq2 = fields.Integer(
-        related='kpi_expression_id.subkpi_id.sequence',
-        store=True,
+        compute='_compute_seq',
         readonly=True,
     )
 
+    @api.depends('kpi_expression_id.kpi_id.sequence',
+                 'kpi_expression_id.subkpi_id.sequence')
+    def _compute_seq(self):
+        for rec in self:
+            seq1 = rec.kpi_expression_id.kpi_id.sequence
+            if seq1:
+                rec.seq1 = seq1
+
+            seq2 = rec.kpi_expression_id.subkpi_id.sequence
+            if seq2:
+                rec.seq2 = seq2
+
     @api.depends('kpi_expression_id.subkpi_id.name',
                  'kpi_expression_id.kpi_id.name',
                  'date_from',

mis_builder/models/mis_report_instance.py

@@ -9,9 +9,11 @@
 
 from odoo import api, fields, models, _
 from odoo.exceptions import ValidationError, UserError
+from odoo.tools.safe_eval import safe_eval
 
 from .aep import AccountingExpressionProcessor as AEP
 
+
 _logger = logging.getLogger(__name__)
 
 
@@ -431,6 +433,30 @@ def _default_company_id(self):
     date_from = fields.Date(string="From")
     date_to = fields.Date(string="To")
     temporary = fields.Boolean(default=False)
+    mis_report_view = fields.Text(string='MIS Report view',
+                                  compute='_compute_mis_report_view')
+
+    def _compute_mis_report_view(self):
+        """This method is dummy because we use this field as a placeholder
+        to render the actual mis report instance in the html format using the
+        widget"""
+        for rec in self:
+            rec.mis_report_view = ""
+
+    @api.model
+    def get_mis_report_view_html(self):
+        mis_report_data = self.compute()
+        rcontext = {}
+        rcontext['mis_report_data'] = mis_report_data
+        rcontext['mis_report_data']['report_name'] = self.name
+        rcontext['mis_instance_id'] = self.id
+        return self.env.ref(
+            'mis_builder.MisReportInstance').render(rcontext)
+
+    @api.multi
+    def get_mis_report_view_from_id(self):
+        for rec in self:
+            return rec.get_mis_report_view_html()
 
     @api.onchange('company_id', 'multi_company')
     def _onchange_company(self):
@@ -527,43 +553,31 @@ def _onchange_dates(self):
                     self.date_to != self.date_range_id.date_end:
                 self.date_range_id = False
 
-    @api.multi
-    def preview(self):
-        self.ensure_one()
-        view_id = self.env.ref('mis_builder.'
-                               'mis_report_instance_result_view_form')
-        return {
-            'type': 'ir.actions.act_window',
-            'res_model': 'mis.report.instance',
-            'res_id': self.id,
-            'view_mode': 'form',
-            'view_type': 'form',
-            'view_id': view_id.id,
-            'target': 'current',
-        }
-
     @api.multi
     def print_pdf(self):
         self.ensure_one()
+        context = dict(self.env.context, active_ids=self.ids)
         return {
             'name': 'MIS report instance QWEB PDF report',
             'model': 'mis.report.instance',
-            'type': 'ir.actions.report.xml',
+            'type': 'ir.actions.report',
             'report_name': 'mis_builder.report_mis_report_instance',
             'report_type': 'qweb-pdf',
-            'context': self.env.context,
+            'context': context,
         }
 
     @api.multi
     def export_xls(self):
         self.ensure_one()
+        context = dict(self.env.context, active_ids=self.ids)
         return {
             'name': 'MIS report instance XLSX report',
             'model': 'mis.report.instance',
-            'type': 'ir.actions.report.xml',
-            'report_name': 'mis.report.instance.xlsx',
+            'type': 'ir.actions.report',
+            'report_name': 'mis_builder.mis_report_instance_xlsx',
             'report_type': 'xlsx',
-            'context': self.env.context,
+            'report_file': 'mis_report_instance',
+            'context': context,
         }
 
     @api.multi
@@ -675,6 +689,21 @@ def _compute_matrix(self):
         kpi_matrix.compute_sums()
         return kpi_matrix
 
+    @api.multi
+    def preview(self):
+        self.ensure_one()
+        view_id = self.env.ref('mis_builder.'
+                               'mis_report_instance_result_view_form')
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'mis.report.instance',
+            'res_id': self.id,
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': view_id.id,
+            'target': 'current',
+        }
+
     @api.multi
     def compute(self):
         self.ensure_one()
@@ -684,6 +713,7 @@ def compute(self):
     @api.multi
     def drilldown(self, arg):
         self.ensure_one()
+        arg = safe_eval(arg)
         period_id = arg.get('period_id')
         expr = arg.get('expr')
         account_id = arg.get('account_id')

mis_builder/report/mis_report_instance_qweb.py

@@ -10,15 +10,15 @@
 
 
 class Report(models.Model):
-    _inherit = "report"
+    _inherit = "ir.actions.report"
 
-    @api.model
-    def get_pdf(self, docids, report_name, html=None, data=None):
+    @api.multi
+    def render_qweb_pdf(self, res_ids=None, data=None):
         ctx = self.env.context.copy()
-        if docids:
-            report = self._get_report_from_name(report_name)
-            obj = self.env[report.model].browse(docids)[0]
+        if res_ids:
+            obj = self.env[self.model].browse(res_ids)[0]
             if hasattr(obj, 'landscape_pdf') and obj.landscape_pdf:
                 ctx.update({'landscape': True})
-        return super(Report, self.with_context(ctx)).get_pdf(
-            docids, report_name, html=html, data=data)
+        return super(Report, self.with_context(ctx)).render_qweb_pdf(
+            res_ids, data
+        )

mis_builder/report/mis_report_instance_qweb.xml

@@ -1,34 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
 
-    <record id="qweb_pdf_export" model="ir.actions.report.xml">
+    <record id="qweb_pdf_export" model="ir.actions.report">
       <field name="name">MIS report instance QWEB PDF report</field>
       <field name="model">mis.report.instance</field>
-      <field name="type">ir.actions.report.xml</field>
+      <field name="type">ir.actions.report</field>
       <field name="report_name">mis_builder.report_mis_report_instance</field>
       <field name="report_type">qweb-pdf</field>
-      <field name="auto" eval="False"/>
     </record>
-
-    <template id="assets_report" inherit_id="report.assets_common">
-        <xpath expr="." position="inside">
-          <link href="/mis_builder/static/src/css/report.css" rel="stylesheet"/>
-        </xpath>
-    </template>
-
+  
     <!--
         TODO we use divs with css table layout, but this has drawbacks:
              (bad layout of first column, no colspan for first header row),
              consider getting back to a plain HTML table.
     -->
 
     <template id="report_mis_report_instance">
-      <t t-call="report.html_container">
+      <t t-call="web.html_container">
         <t t-foreach="docs" t-as="o">
-          <t t-call="report.internal_layout">
+          <t t-call="web.internal_layout">
             <t t-set="matrix" t-value="o._compute_matrix()"/>
             <t t-set="style_obj" t-value="o.env['mis.report.style']"/>
             <div class="page">
+              <link href="/mis_builder/static/src/css/report.css" rel="stylesheet"/>
               <h3><span t-field="o.name" /><span> - </span>
                 <t t-foreach="o.query_company_ids" t-as="company">
                   <span t-field="company.name" /><span t-if="company != o.query_company_ids[-1]">, </span>

mis_builder/report/mis_report_instance_xlsx.py

@@ -6,35 +6,23 @@
 import logging
 import numbers
 
-from odoo.report import report_sxw
+from odoo import models
 
 from ..models.accounting_none import AccountingNone
 from ..models.data_error import DataError
 
 _logger = logging.getLogger(__name__)
 
-try:
-    from odoo.addons.report_xlsx.report.report_xlsx import ReportXlsx
-except ImportError:
-    _logger.debug("report_xlsx not installed, Excel export non functional")
-
-    class ReportXlsx(object):
-        def __init__(self, *args, **kwargs):
-            pass
-
 
 ROW_HEIGHT = 15  # xlsxwriter units
 COL_WIDTH = 0.9  # xlsxwriter units
 MIN_COL_WIDTH = 10  # characters
 MAX_COL_WIDTH = 50  # characters
 
 
-class MisBuilderXlsx(ReportXlsx):
-
-    def __init__(self, name, table, rml=False, parser=False, header=True,
-                 store=False):
-        super(MisBuilderXlsx, self).__init__(
-            name, table, rml, parser, header, store)
+class MisBuilderXlsx(models.AbstractModel):
+    _name = 'report.mis_builder.mis_report_instance_xlsx'
+    _inherit = 'report.report_xlsx.abstract'
 
     def generate_xlsx_report(self, workbook, data, objects):
 
@@ -144,7 +132,3 @@ def generate_xlsx_report(self, workbook, data, objects):
         min_col_pos = min(col_width.keys())
         max_col_pos = max(col_width.keys())
         sheet.set_column(min_col_pos, max_col_pos, data_col_width * COL_WIDTH)
-
-
-MisBuilderXlsx('report.mis.report.instance.xlsx',
-               'mis.report.instance', parser=report_sxw.rml_parse)

mis_builder/report/mis_report_instance_xlsx.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
 
-    <record id="xls_export" model="ir.actions.report.xml">
-      <field name="name">MIS report instance XLS report</field>
-      <field name="model">mis.report.instance</field>
-      <field name="type">ir.actions.report.xml</field>
-      <field name="report_name">mis.report.instance.xlsx</field>
-      <field name="report_type">xlsx</field>
-      <field name="auto" eval="False"/>
+    <record id="xls_export" model="ir.actions.report">
+        <field name="name">MIS report instance XLS report</field>
+        <field name="model">mis.report.instance</field>
+        <field name="type">ir.actions.report</field>
+        <field name="report_name">mis_builder.mis_report_instance_xlsx</field>
+        <field name="report_type">xlsx</field>
+        <field name="report_file">mis_report_instance</field>
     </record>
 
 </odoo>