[11.0] migration

.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/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2015 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 

mis_builder/__manifest__.py

@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 {
     '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
@@ -31,9 +30,9 @@
         'report/mis_report_instance_xlsx.xml',
     ],
     'qweb': [
-        'static/src/xml/*.xml'
+        'static/src/xml/mis_report_widget.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()</field>
             <field name="active" eval="True" />
         </record>
 

mis_builder/migrations/8.0.2.0.0/post-migration.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 

mis_builder/migrations/8.0.2.0.0/pre-migration.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 

mis_builder/models/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2015 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 

mis_builder/models/accounting_none.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2016 Thomas Binsfeld
 # Copyright 2016-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

mis_builder/models/aep.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 

mis_builder/models/aggregate.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 

mis_builder/models/data_error.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2016-2017 ACSONE SA/NV (<http://acsone.eu>)
 # Copyright 2016 Akretion (<http://akretion.com>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

mis_builder/models/kpimatrix.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 

mis_builder/models/mis_kpi_data.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2017 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 

mis_builder/models/mis_report.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 

mis_builder/models/mis_report_instance.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# Copyright 2014-2016 ACSONE SA/NV (<http://acsone.eu>)
+# Copyright 2014-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 import datetime
@@ -545,25 +544,28 @@ def preview(self):
     @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

mis_builder/models/mis_report_style.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2016 Therp BV (<http://therp.nl>)
 # Copyright 2016-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

mis_builder/models/mis_safe_eval.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2016-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 

mis_builder/models/simple_array.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 """ A trivial immutable array that supports basic arithmetic operations.
@@ -84,8 +83,6 @@
 2.0 1.0 Vector((2.0, 1.0))
 """
 
-from __future__ import print_function
-
 import itertools
 import operator
 import traceback

mis_builder/report/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2015 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 

mis_builder/report/mis_report_instance_qweb.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
@@ -10,15 +9,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,16 +1,15 @@
 <?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">
+    <template id="assets_report" inherit_id="web.report_assets_common">
         <xpath expr="." position="inside">
           <link href="/mis_builder/static/src/css/report.css" rel="stylesheet"/>
         </xpath>
@@ -23,9 +22,9 @@
     -->
 
     <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">

mis_builder/report/mis_report_instance_xlsx.py

@@ -1,40 +1,27 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from collections import defaultdict
 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 +131,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>