First Cut Version 9.0

richard-willdooit · Feb 15, 2016 · 67ead14 · 67ead14
1 parent f51ac6f
commit 67ead14
Show file tree

Hide file tree

Showing 53 changed files with 722 additions and 954 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 A more detailed description of changes can be found on the [Pentaho Report for OpenERP wiki](https://github.com/WillowIT/Pentaho-reports-for-OpenERP/wiki/Significant-Changes "Pentaho Reports for OpenERP Wiki")
 
+* February 2016 - Upgrade to support Odoo version 9.0.
 * September 2015 - Overcome previous limitation - Now works with the auth_crypt module turned on.
 * August 2015 - Remove need for special duplicated "Pentaho user" - a limitation has been introduced for object based reports with password encryption turned on - work-around in pipeline.
 * August 2015 - Testing with Pentaho version 5.4 - updated war file on Willow website.
@@ -25,7 +26,7 @@ A more detailed description of changes can be found on the [Pentaho Report for O
 This project provides a system that integrates OpenERP with the Pentaho reporting system. End users of OpenERP can design reports using Pentaho report designer v5.0 through v5.4, and install/access them from inside the OpenERP interface. 
 
 ### Features:
-* Support for OpenERP 6.1, 7.0, and 8.0.
+* Support for OpenERP 6.1, 7.0, 8.0, and 9.0.
 * OpenERP data can be accessed via SQL, objects, custom python procedures, or via "Pentaho Data Integration" tools.
 * Report parameters specified in the designer are automatically prompted for when the report is run from OpenERP.
 * Parameters can be generated dynamically from various data sources. 

diff --git a/java_server/build.xml b/java_server/build.xml
@@ -1,5 +1,5 @@
 <!--===========================================================================
-  This is the build file for the pentaho-reports-for-openerp project.
+  This is the build file for the pentaho-reports-for-odoo project.
   
   This build file will use the build-res/subfloor.xml file as the default build
   process and should only override the tasks that need to differ from

diff --git a/...ddon/pentaho_report_scheduler/__init__.py → ...ddon/pentaho_report_scheduler/__init__.py b/...ddon/pentaho_report_scheduler/__init__.py → ...ddon/pentaho_report_scheduler/__init__.py
diff --git a/...n/pentaho_report_scheduler/__openerp__.py → ...n/pentaho_report_scheduler/__openerp__.py b/...n/pentaho_report_scheduler/__openerp__.py → ...n/pentaho_report_scheduler/__openerp__.py
diff --git a/...don/pentaho_report_scheduler/scheduler.py → ...don/pentaho_report_scheduler/scheduler.py b/...don/pentaho_report_scheduler/scheduler.py → ...don/pentaho_report_scheduler/scheduler.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from openerp import models, fields, api, _
 import datetime
 from openerp import netsvc
@@ -68,7 +70,6 @@ def _send_reports(self, reports):
                 self.env['mail.message'].create({'subject': self.name,
                                                  'type': "notification",
                                                  'partner_ids': [(6, 0, receiver_ids)],
-                                                 'notified_partner_ids': [(6, 0, receiver_ids)],
                                                  'attachment_ids': [(6, 0, attachments.ids)],
                                                  'body': report_summary,
                                                  })
@@ -85,7 +86,7 @@ def _report_variables(self, line):
             promptwizard_obj = self.env['ir.actions.report.promptwizard']
 
             # default_get creates a dictionary of wizard default values
-            values = promptwizard_obj.default_get_external(line.report_id.id)
+            values = promptwizard_obj.default_get_external(line.report_id)
             # this hook is provided to allow for selection set values, which are not necessarily installed
             values.update(self._check_overriding_values(line, values))
 

diff --git a/odoo_addon/pentaho_report_scheduler/scheduler.xml b/odoo_addon/pentaho_report_scheduler/scheduler.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+<data noupdate="1"> <!-- 'noupdate' means existing data is *not* overwritten when module is updated. Don't update because users may have modified the scheduled interval etc. -->
+    <!-- Add Scheduler -->
+    <record id="ir_cron_scheduled_rpts" model="ir.cron">
+        <field name="name">Report Email Scheduler</field>
+        <field eval="True" name="active" />
+        <field name="user_id" ref="base.user_root"/>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="nextcall">2000-01-01 00:00:00</field>
+        <field name="numbercall">-1</field>
+        <field eval="False" name="doall" />
+        <field name="model">ir.actions.report.scheduler</field>
+        <field name="function">run_report_email_scheduler</field>
+        <field name="args">([''])</field>
+        <field name="priority">10</field>
+    </record>
+</data>
+</odoo>
diff --git a/odoo_addon/pentaho_report_scheduler/scheduler_view.xml b/odoo_addon/pentaho_report_scheduler/scheduler_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<data>
+    <record id="view_sched_form" model="ir.ui.view">
+        <field name="name">view.sched.form</field>
+        <field name="model">ir.actions.report.scheduler</field>
+        <field name="arch" type="xml">
+            <form string="Report Scheduler">
+                <header>
+                    <button name="button_run_now" string="Run Now" type="object" icon="STOCK_GO_FORWARD"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                    </div>
+                    <group>
+                    <field name='action_type'/>
+                        </group>
+                    <notebook>
+                        <page string='Description'>
+                            <field name="description" nolabel='1'/>
+                        </page>
+                        <page string='Reports'>
+                            <field name="line_ids" nolabel="1" colspan="4">
+                                <tree string='Reports' editable='bottom'>
+                                    <field name='sequence' widget='handle'/>
+                                    <field name='report_id'/>
+                                    <field name='model'/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string='Users'>
+                            <field name="user_list" nolabel="1" colspan="4"/>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_sched_tree" model="ir.ui.view">
+        <field name="name">view.sched.tree</field>
+        <field name="model">ir.actions.report.scheduler</field>
+        <field name="arch" type="xml">
+            <tree string="Report Scheduler" version="7.0">
+                <field name="name"/>
+                <button name="button_run_now" string="Run Now" type="object" icon="STOCK_GO_FORWARD"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_sched_form" model="ir.actions.act_window">
+        <field name="name">Report Scheduler</field>
+        <field name="res_model">ir.actions.report.scheduler</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name='view_id' ref='view_sched_tree'/>
+    </record>
+
+    <menuitem id="menu_sched_form" action="action_sched_form" parent="base.menu_automation" sequence="50"/>
+</data>
+</odoo>
diff --git a/...rt_scheduler/security/ir.model.access.csv → ...rt_scheduler/security/ir.model.access.csv b/...rt_scheduler/security/ir.model.access.csv → ...rt_scheduler/security/ir.model.access.csv
diff --git a/...port_scheduler_selection_sets/__init__.py → ...port_scheduler_selection_sets/__init__.py b/...port_scheduler_selection_sets/__init__.py → ...port_scheduler_selection_sets/__init__.py
diff --git a/...t_scheduler_selection_sets/__openerp__.py → ...t_scheduler_selection_sets/__openerp__.py b/...t_scheduler_selection_sets/__openerp__.py → ...t_scheduler_selection_sets/__openerp__.py
@@ -24,6 +24,6 @@
     'demo': [],
     'test': [],
     'installable': True,
-    'auto_install': False,
+    'auto_install': True,
     'application': False,
 }
diff --git a/...ort_scheduler_selection_sets/scheduler.py → ...ort_scheduler_selection_sets/scheduler.py b/...ort_scheduler_selection_sets/scheduler.py → ...ort_scheduler_selection_sets/scheduler.py
@@ -1,5 +1,6 @@
+# -*- coding: utf-8 -*-
+
 from openerp import fields, models, api, _
-from openerp.exceptions import Warning
 
 import json
 

diff --git a/odoo_addon/pentaho_report_scheduler_selection_sets/scheduler_view.xml b/odoo_addon/pentaho_report_scheduler_selection_sets/scheduler_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<data>
+    <record id="view_sched_form_sel_sets" model="ir.ui.view">
+        <field name="name">view.sched.form.sel.sets</field>
+        <field name='inherit_id' ref='pentaho_report_scheduler.view_sched_form'/>
+        <field name="model">ir.actions.report.scheduler</field>
+        <field name="arch" type="xml">
+            <field name='model' position='after'>
+                <field name='selectionset_id'/>
+            </field>
+        </field>
+    </record>
+</data>
+</odoo>
diff --git a/...pentaho_report_selection_sets/__init__.py → ...pentaho_report_selection_sets/__init__.py b/...pentaho_report_selection_sets/__init__.py → ...pentaho_report_selection_sets/__init__.py
diff --git a/...taho_report_selection_sets/__openerp__.py → ...taho_report_selection_sets/__openerp__.py b/...taho_report_selection_sets/__openerp__.py → ...taho_report_selection_sets/__openerp__.py