Merge lp:~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin into lp:~therp-nl/therp-addons/7.0

[Holger Brunn (Therp)]

[ADD] port report_aeroo_ooo_plugin

This is a port of report_aeroo_ooo_plugin to use odoo's built in filters.

Some small things were changed too:
- ids which were colliding with the report designer plugin were changed
- odoo branding
- provide a sample document template

[lp:~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin]

121. By Holger Brunn (Therp) on 2014-07-24

[IMP] bump versions

[Stefan Rijnhart (Opener) (stefan-opener)]

Very cool

review: Approve

=== renamed directory '__unported__/report_aeroo_ooo_plugin' => 'report_aeroo_ooo_plugin'
=== modified file 'report_aeroo_ooo_plugin/__openerp__.py'
--- __unported__/report_aeroo_ooo_plugin/__openerp__.py	2012-12-28 14:10:30 +0000
+++ report_aeroo_ooo_plugin/__openerp__.py	2014-07-24 15:15:04 +0000
@@ -19,44 +19,68 @@
 #
 ##############################################################################
 {
-    "name" : "Aeroo reports plugin for OpenOffice.Org",
-    "version" : "0.1r33",
-    "author" : "Therp BV",
+    "name": "Aeroo reports plugin for OpenOffice.Org",
+    "version": "0.2",
+    "author": "Therp BV",
     "category": 'Generic Modules/Aeroo Reporting',
     'complexity': "normal",
     "description": """
+Introduction
+------------
 This module provides an OpenOffice.org/LibreOffice extension plus a small
 interface to the Aeroo Report module on the OpenERP side to allow mail merge
 directly from the Writer application. Mail merge is performed on records
-stored in the saved selection in OpenERP. The result is a single document in
+stored in the saved selection in Odoo. The result is a single document in
 editable ODF, appearing in a new office window.
 
 The ability to perform mail merge on the fly reliefs the administrator from
 having to create a Report XML record in the OpenERP database and upload the
 template after every change.
 
-Note that the ability to store and share selections of
-OpenERP records is provided by the Saved Selection module by Therp BV. Due
-to this dependency, this module is only fully functional in combination with
-the OpenERP web client.
-
 After installation of this module, you can download the extension file
-from your OpenERP database under
+from your Odoo database under
 
 Settings -> Customization -> Aeroo Reports -> Download Office Extension
 
-Known issues:
-If the resulting document does not contain page breaks between the merged
-template on different records, make sure that the document ends with a
-line break.
-
-This module is compatible with OpenERP 6.1.
-    """,
+Usage
+-----
+In the web client, save a custom filter. When doing a mail merge, choose one of
+those filters and your document will be filled with the records in the filter's
+selection.
+
+Figuring out the correct fields to use can be tricky, use the web client's
+debug mode to find out a field's name. Further, consult the provided document
+template (this is a mail merge intended to work on partners) for some general
+usage hints.
+
+Requirements
+------------
+
+On the client side, you need to install the extension via Tools -> Extension
+Manager -> Add. After installation, restart Writer in order to see the newly
+created menus.
+
+You also need python-uno (*not python3-uno*) installed on the client machines.
+
+Configure access to your database via Tools -> Options -> LibreOffice Writer ->
+Odoo Options.
+
+Troubleshooting
+---------------
+
+If you experience an empty configuration dialog or missing translations,
+probably your extension registry is corrupt.
+
+``rm -rf ~/.config/libreoffice/4/user{extensions,uno_packages}``
+
+fixes the problem, but you lose all installed extensions, their configuration
+and you'll have to reinstall them.
+""",
     "website": 'http://therp.nl',
-    "images" : ['images/options.png', 'images/merge.png'],
-    "depends" : ['report_aeroo', 'trp_saved_selection'],
+    "images": ['images/options.png', 'images/merge.png'],
+    "depends": ['report_aeroo'],
     'data': [
         'view/get_plugin.xml',
     ],
-    'installable': False,
+    'installable': True,
 }

=== modified file 'report_aeroo_ooo_plugin/model/__init__.py'
--- __unported__/report_aeroo_ooo_plugin/model/__init__.py	2012-07-09 13:47:10 +0000
+++ report_aeroo_ooo_plugin/model/__init__.py	2014-07-24 15:15:04 +0000
@@ -1,2 +1,3 @@
 import instant_aeroo
 import get_plugin
+from . import ir_filters

=== modified file 'report_aeroo_ooo_plugin/model/get_plugin.py'
--- __unported__/report_aeroo_ooo_plugin/model/get_plugin.py	2012-08-09 14:50:47 +0000
+++ report_aeroo_ooo_plugin/model/get_plugin.py	2014-07-24 15:15:04 +0000
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    This module copyright (c) 2012 Therp BV (<http://therp.nl>)
-# 
+#
 #    Thanks to the contributors of Stackoverflow refered to below.
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -21,11 +21,15 @@
 #
 ##############################################################################
 
-import os, glob, base64
+import os
+import glob
+import base64
 import zipfile
 from StringIO import StringIO
-from osv import osv, fields
-from addons import get_module_resource
+from openerp.osv import osv, fields
+from openerp.addons import get_module_resource
+from openerp.tools import human_size
+
 
 class GetPlugin(osv.TransientModel):
     _name = 'report.aeroo.get_plugin'
@@ -33,25 +37,34 @@
     def get_plugin_zipfile(self, cr, uid, context=None):
 
         def addFolderToZip(myZipFile, folder, path):
-            # http://stackoverflow.com/questions/458436/adding-folders-to-a-zip-file-using-python/459419#459419
-            folder = folder.encode('ascii') #convert path to ascii for ZipFile Method
+            # http://stackoverflow.com/questions/458436/adding-folders-to-a-
+            # zip-file-using-python/459419#459419
+            #convert path to ascii for ZipFile Method
+            folder = folder.encode('ascii')
             for file in glob.glob(folder + "/*"):
                 relpath = os.path.join(path, os.path.basename(file))
-                print relpath
                 if os.path.isfile(file):
                     myZipFile.write(file, relpath, zipfile.ZIP_DEFLATED)
                 elif os.path.isdir(file):
                     addFolderToZip(myZipFile, file, relpath)
 
-        # http://stackoverflow.com/questions/3610221/how-to-create-an-in-memory-zip-file-with-directories-without-touching-the-disk
+        # http://stackoverflow.com/questions/3610221/how-to-create-an-in-
+        # memory-zip-file-with-directories-without-touching-the-disk
         inMemoryOutputFile = StringIO()
-        zipFile = zipfile.ZipFile(inMemoryOutputFile, 'w') 
+        zipFile = zipfile.ZipFile(inMemoryOutputFile, 'w')
         addFolderToZip(
-            zipFile, get_module_resource('report_aeroo_ooo_plugin', 'plugin'), '')
+            zipFile, get_module_resource(
+                'report_aeroo_ooo_plugin', 'plugin'),
+            '')
         zipFile.close()
         inMemoryOutputFile.seek(0)
+        data = base64.encodestring(inMemoryOutputFile.getvalue())
+
+        if context and context.get('bin_size'):
+            return human_size(len(data))
+
         return base64.encodestring(inMemoryOutputFile.getvalue())
-    
+
     _columns = {
         'name': fields.char(
             'Filename', size=128, readonly=True),

=== modified file 'report_aeroo_ooo_plugin/model/instant_aeroo.py'
--- __unported__/report_aeroo_ooo_plugin/model/instant_aeroo.py	2012-08-09 14:50:47 +0000
+++ report_aeroo_ooo_plugin/model/instant_aeroo.py	2014-07-24 15:15:04 +0000
@@ -3,11 +3,11 @@
 #
 #    OpenERP, Open Source Management Solution
 #    This module copyright (c) 2012 Therp BV (<http://therp.nl>)
-# 
+#
 #    Heavily based on and to be used with the Aeroo reports modules
 #        which are
 #        Copyright (c) 2009-2011 Alistek Ltd (http://www.alistek.com)
-#        Copyright (C) 2009  Domsense s.r.l.                                   
+#        Copyright (C) 2009  Domsense s.r.l.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -34,10 +34,13 @@
 """
 
 import base64
-from osv import osv
-from report.report_sxw import rml_parse
-from report_aeroo.report_aeroo import Aeroo_report
-import pooler
+from openerp.osv import osv
+from openerp.tools.translate import _
+from openerp.tools.safe_eval import const_eval
+from openerp.report.report_sxw import rml_parse
+from openerp.addons.report_aeroo.report_aeroo import Aeroo_report
+from openerp.addons.report_aeroo.report_aeroo import AerooPrint
+
 
 class report_xml_duck(object):
     attachment = False
@@ -49,6 +52,7 @@
     preload_mode = False
     fallback_false = True
     content_fname = False
+    report_name = ''
     id = []
 
     def __init__(self, file_data):
@@ -58,11 +62,10 @@
         # and adjust in_format accordingly
         self.in_format = 'oo-odt'
 
+
 class Aeroo_report_instant(Aeroo_report):
 
     def __init__(self, cr, table):
-#        super(Aeroo_instant_report, self).__init__(name, table, rml, parser, header, store)
-#        self.logger("registering %s (%s)" % (name, table), netsvc.LOG_INFO)
         self.name = 'report.odt.instantaeroo'
         self.name2 = 'odt'
         self.oo_subreports = []
@@ -70,46 +73,42 @@
         self.counters = {}
         self.table = table
         self.parser = rml_parse
+        self.active_prints = {False: AerooPrint()}
+
 
 class instant_aeroo(osv.TransientModel):
     _name = 'instant.aeroo'
-    """ Wrapper for Aeroo_instant_report, 
-    as exposed through xml-rpc
-    """
+    """ Wrapper for Aeroo_instant_report, as exposed through xml-rpc """
 
-    def create_report(self, cr, uid, file_data, context=None):
+    def create_report(self, cr, uid, file_data, filter_id, context=None):
         """
         Return a tuple (list_of_docs, type)
         """
         if context is None:
             context = {}
-       
-        store = self.pool.get('saved_selection.selection').get(
-            cr, uid, context)
-        if not store:
-            return (False, "No saved selection defined for this user.")
-
-        # TODO: do a check against the template model?
-        (model, ids) = store
+
+        saved_filter = self.pool['ir.filters'].browse(cr, uid, filter_id,
+                                                      context=context)
+        ids = self.pool[saved_filter.model_id].search(
+            cr, uid,
+            const_eval(saved_filter.domain),
+            context=const_eval(saved_filter.context))
+
         if not ids:
-            return (False, "User's selection does not contain any items.")
+            return (False, _("User's selection does not contain any items."))
 
         data = {
             'report_type': 'aeroo',
-            'model': model
+            'model': saved_filter.model_id
         }
-        context['active_model'] = model
-                
+        ctx = context.copy()
+        ctx['active_model'] = saved_filter.model_id
+
         try:
-            report = Aeroo_report_instant(cr, model)
+            report = Aeroo_report_instant(cr, saved_filter.model_id)
             report_xml = report_xml_duck(file_data)
-            to_return = [[], False]
-            for res_id in ids:
-                res = report.create_aeroo_report(
-                    cr, uid, [res_id], data, report_xml, context=context)
-                if res and res[0]:
-                    to_return[0].append(base64.encodestring(res[0]))
-                    to_return[1] = res[1]
-        except Exception, e:
-            to_return = (False, unicode(e))
-        return to_return
+            res = report.create_aeroo_report(
+                cr, uid, ids, data, report_xml, context=context)
+            return (base64.encodestring(res[0]), res[1])
+        except ValueError, e:
+            return (False, unicode(e))

=== added file 'report_aeroo_ooo_plugin/model/ir_filters.py'
--- report_aeroo_ooo_plugin/model/ir_filters.py	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin/model/ir_filters.py	2014-07-24 15:15:04 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv.orm import Model
+
+
+class IrFilters(Model):
+    _inherit = 'ir.filters'
+
+    def get_libreoffice_filters(self, cr, uid, context=None):
+        result = []
+        for this in self.browse(
+                cr, uid,
+                self.search(
+                    cr, uid,
+                    [('user_id', 'in', [uid, False])],
+                    order='model_id, name',
+                    context=context),
+                context=context):
+            model = self.pool['ir.model'].browse(
+                cr, uid,
+                self.pool['ir.model'].search(
+                    cr, uid, [('model', '=', this.model_id)],
+                    context=context)[0],
+                context)
+            result.append(
+                (
+                    this.id,
+                    "%s (%s)" % (this.name, model.name),
+                )
+            )
+        return result

=== modified file 'report_aeroo_ooo_plugin/plugin/META-INF/manifest.xml'
--- __unported__/report_aeroo_ooo_plugin/plugin/META-INF/manifest.xml	2012-07-11 12:10:19 +0000
+++ report_aeroo_ooo_plugin/plugin/META-INF/manifest.xml	2014-07-24 15:15:04 +0000
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="registry/data/org/openerp/OpenERPOptions.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
-                       manifest:full-path="registry/schema/org/openerp/OpenERPOptions.xcs"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="registry/data/org/openoffice/Office/OptionsDialog.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="registry/data/org/openoffice/Office/Addons.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Python"
-		       manifest:full-path="pythonpath/Localization.py"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Python"
-		       manifest:full-path="pythonpath/OptionsHandler.py"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Python" 
-                       manifest:full-path="OpenERP_Aeroo.py"/>
+    <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+        manifest:full-path="registry/data/org/odoo/report_aeroo_ooo_plugin/OpenERPOptions.xcu"/>
+    <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+        manifest:full-path="registry/schema/org/odoo/report_aeroo_ooo_plugin/OpenERPOptions.xcs"/>
+    <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+        manifest:full-path="registry/data/org/openoffice/Office/OptionsDialog.xcu"/>
+    <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+        manifest:full-path="registry/data/org/openoffice/Office/Addons.xcu"/>
+    <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Python"
+        manifest:full-path="pythonpath/Localization.py"/>
+    <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Python"
+        manifest:full-path="pythonpath/OptionsHandler.py"/>
+    <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Python" 
+        manifest:full-path="OpenERP_Aeroo.py"/>
+    <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+        manifest:full-path="Paths.xcu"/>
 </manifest:manifest>

=== modified file 'report_aeroo_ooo_plugin/plugin/OpenERP_Aeroo.py'
--- __unported__/report_aeroo_ooo_plugin/plugin/OpenERP_Aeroo.py	2012-10-11 12:07:18 +0000
+++ report_aeroo_ooo_plugin/plugin/OpenERP_Aeroo.py	2014-07-24 15:15:04 +0000
@@ -1,17 +1,13 @@
-##########################################################################
+# -*- coding: utf-8 -*-
+##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#
-#    This module (C) 2012 Therp BV (<http://therp.nl>)
-#
-#    Contains elements from the OpenERP Report Designer plugin
-#    for OpenOffice, Copyright (C) 2004-2012 OpenERP SA 
-#    (<http://openerp.com>). 
+#    This module copyright (C) 2012-2014 Therp BV (<http://therp.nl>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +17,6 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-#
 ##############################################################################
 
 import os
@@ -32,14 +27,23 @@
 import traceback
 from com.sun.star.task import XJobExecutor
 
-import Danny
+try:
+    import Danny
+except ImportError:
+    #enable to run without extension context
+    sys.path.append(os.path.join(
+        os.path.dirname(__file__),
+        'pythonpath',
+    ))
+    import Danny
 import TinySocket
 import FileUtils
 import Localization
 import LoginObject
 
+
 class Merge(Localization.LocalizedObject, XJobExecutor):
-    """ 
+    """
     Send the current open document to the OpenERP server
     and trigger an Aeroo report on resources in the
     stored selection. Merge the documents into one, separated
@@ -49,22 +53,16 @@
 
     def __init__(self, ctx):
         super(Merge, self).__init__(ctx)
-        try:
-            self.__init_wrapped__(ctx)
-        except Exception, e:
-            print >> sys.stderr, e
-            traceback.print_exc(file=sys.stderr)
+        self.ctx = ctx
+        self.module = "OpenERP_Aeroo"
+        self.version = "0.1"
 
-    def __init_wrapped__(self, ctx):
-       
-        self.ctx     = ctx
-        self.module  = "OpenERP_Aeroo"
-        self.version = "0.1"
-        login = LoginObject.LoginObject(ctx).getLogin()
+    def trigger(self, args):
+        login = LoginObject.LoginObject(self.ctx).getLogin()
         if not login:
             exit(1)
         (url, database, uid, password) = login
-        self.sock=TinySocket.RPCSession(ctx, url)
+        self.sock = TinySocket.RPCSession(self.ctx, url)
         Desktop = Danny.getDesktop()
         current = Desktop.getCurrentComponent()
         if not current.hasLocation():
@@ -79,6 +77,31 @@
                         "application/vnd.oasis.opendocument.text"))
                 )
         current.store()
+
+        dialog = self.ctx.getServiceManager()\
+            .createInstanceWithContext(
+                "com.sun.star.awt.DialogProvider", self.ctx)\
+            .createDialog(
+                "vnd.sun.star.extension://org.odoo.report_aeroo_ooo_plugin/"
+                "dialogs/FilterChooser.xdl")
+
+        listbox = dialog.getControl('filter')
+        filters = self.sock.execute(
+            database, uid, password, 'ir.filters', 'get_libreoffice_filters')
+        listbox.addItems(tuple(n for i, n in filters), 0)
+        listbox.setText(listbox.getItem(0))
+
+        filter_id = None
+        if dialog.execute():
+            filter_id = None
+            filters = [i for i, n in filters if n == listbox.getText()]
+            if filters:
+                filter_id = filters[0]
+            else:
+                dialog.dispose()
+                return
+        dialog.dispose()
+
         data = FileUtils.read_data_from_file(
             FileUtils.get_absolute_file_path(
                 current.getURL()[7:]
@@ -90,44 +113,21 @@
             password,
             'instant.aeroo',
             'create_report',
-            base64.encodestring(data)
+            base64.encodestring(data),
+            filter_id
             )
         if res:
             if res[0]:
-                # Combine files, based on 
+                # Combine files, based on
                 # Russell Philip's OOO Macros
                 # http://sourceforge.net/projects/ooomacros/files/ (GPL)
                 tempFile = tempfile.mkstemp('.odt')
                 os.close(tempFile[0])
                 filename = tempFile[1]
-                component = False
-                for doc in res[0]:
-                    if not component:
-                        FileUtils.write_data_to_file(
-                            filename,
-                            base64.decodestring(doc)
-                            )
-                        component = Desktop.loadComponentFromURL(
-                            Danny.convertToURL(filename),
-                            "_blank", 0,
-                            ()
-                            )
-                    else:
-                        tempFile = tempfile.mkstemp('.odt')
-                        os.close(tempFile[0])
-                        filename2 = tempFile[1]
-                        FileUtils.write_data_to_file(
-                            filename2,
-                            base64.decodestring(doc)
-                            )
-                        # Get a cursor at the end of the text
-                        oTextRange = component.Text.End
-                        oTextCursor = component.Text.createTextCursorByRange(oTextRange)
-                        # Insert page break by changing PageDescName to the existing page style name
-                        oTextCursor.PageDescName = oTextCursor.PageStyleName
-                        # Insert document at text cursor position
-                        oTextCursor.insertDocumentFromURL (Danny.convertToURL(filename2), ())
-                        os.remove(filename2)
+                FileUtils.write_data_to_file(filename,
+                                             base64.decodestring(res[0]))
+                Desktop.loadComponentFromURL(
+                    Danny.convertToURL(filename), "_blank", 0, ())
             else:
                 # Second arg *may* contain a warning or error message
                 Danny.ErrorDialog(self.localize("error"), "%s" % res[1])
@@ -136,22 +136,27 @@
                               self.localize("not.create"))
 
 g_ImplementationHelper = unohelper.ImplementationHelper()
-g_ImplementationHelper.addImplementation( Merge, "org.openoffice.openerp.report.aeroo.merge", ("com.sun.star.task.Job",),)
+g_ImplementationHelper.addImplementation(
+    Merge,
+    "org.odoo.report_aeroo_ooo_plugin.merge",
+    ("com.sun.star.task.Job",),)
+
 
 class About(Localization.LocalizedObject, XJobExecutor):
     def __init__(self, ctx):
         super(About, self).__init__(ctx)
-        self.module  = "OpenERP_Aeroo"
+        self.module = "OpenERP_Aeroo"
         self.version = "0.1"
         self.win = Danny.DBModalDialog(
             60, 50, 200, 215,
             self.localize("about"))
 
+    def trigger(self, args):
         fdBigFont = Danny.createUnoStruct("com.sun.star.awt.FontDescriptor")
         fdBigFont.Width = 20
         fdBigFont.Height = 25
         fdBigFont.Weight = 120
-        fdBigFont.Family= 3
+        fdBigFont.Family = 3
 
         oLabelProdDesc = self.win.addFixedText("lblProdDesc", 3, 30, 196, 175)
         oLabelProdDesc.Model.TextColor = 1
@@ -164,7 +169,37 @@
         oLabelProdDesc.Model.MultiLine = True
         oLabelProdDesc.Text = self.localize("content")
 
-        self.win.doModalDialog("",None)
-
-g_ImplementationHelper.addImplementation( About, "org.openoffice.openerp.report.aeroo.about", ("com.sun.star.task.Job",),)
-
+        self.win.doModalDialog("", None)
+
+g_ImplementationHelper.addImplementation(
+    About,
+    "org.odoo.report_aeroo_ooo_plugin.about",
+    ("com.sun.star.task.Job",),)
+
+if __name__ == "__main__":
+# from https://wiki.openoffice.org/wiki/UNO_component_packaging#
+# Python_component_testing
+    import os
+    import uno
+
+    # Start OpenOffice.org, listen for connections and open testing document
+    os.system("lowriter '--accept=socket,host=localhost,port=2002;urp;' &")
+
+    # Get local context info
+    localContext = uno.getComponentContext()
+    resolver = localContext.ServiceManager.createInstanceWithContext(
+        "com.sun.star.bridge.UnoUrlResolver", localContext)
+
+    ctx = None
+
+    # Wait until the OO.o starts and connection is established
+    while ctx is None:
+        try:
+            ctx = resolver.resolve(
+                "uno:socket,host=localhost,port=2002;urp;"
+                "StarOffice.ComponentContext")
+        except:
+            pass
+
+    # Trigger our job
+    merge = Merge(ctx)

=== added file 'report_aeroo_ooo_plugin/plugin/Paths.xcu'
--- report_aeroo_ooo_plugin/plugin/Paths.xcu	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin/plugin/Paths.xcu	2014-07-24 15:15:04 +0000
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<oor:component-data oor:package="org.openoffice.Office" oor:name="Paths" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<node oor:name="Paths">
+		<node oor:name="Template" oor:op="fuse">
+			<node oor:name="InternalPaths">
+				<node oor:name="%origin%/template" oor:op="fuse"/>
+			</node>
+		</node>
+	</node>
+</oor:component-data>

=== modified file 'report_aeroo_ooo_plugin/plugin/description.xml'
--- __unported__/report_aeroo_ooo_plugin/plugin/description.xml	2012-07-11 12:10:19 +0000
+++ report_aeroo_ooo_plugin/plugin/description.xml	2014-07-24 15:15:04 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="0.1.1"/>
-    <identifier value="org.openerp"/>
+    <version value="0.2.0"/>
+    <identifier value="org.odoo.report_aeroo_ooo_plugin"/>
     <display-name>
-        <name lang="en">Aeroo Reports (OpenERP) Mail Merge</name>
-        <name lang="nl">Aeroo Reports (OpenERP) Samenvoegen</name>
+        <name lang="en">Odoo Mail Merge</name>
+        <name lang="nl">Odoo Samenvoegen</name>
     </display-name>
     <publisher>
         <name xlink:href="http://therp.nl" lang="en">Therp BV</name>
@@ -13,4 +13,7 @@
     </extension-description>
     <registration>
     </registration>
+    <icon>
+        <default xlink:href="odoo.png" />
+    </icon>
 </description>

=== added file 'report_aeroo_ooo_plugin/plugin/dialogs/FilterChooser.xdl'
--- report_aeroo_ooo_plugin/plugin/dialogs/FilterChooser.xdl	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin/plugin/dialogs/FilterChooser.xdl	2014-07-24 15:15:04 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="FilterChooser" dlg:left="168" dlg:top="158" dlg:width="141" dlg:height="50" dlg:closeable="true" dlg:moveable="true">
+ <dlg:bulletinboard>
+  <dlg:text dlg:id="labelFilter" dlg:tab-index="0" dlg:left="3" dlg:top="3" dlg:width="136" dlg:height="12" dlg:value="&amp;options.filter"/>
+  <dlg:combobox dlg:id="filter" dlg:tab-index="1" dlg:left="3" dlg:top="17" dlg:width="136" dlg:height="12" dlg:spin="true"/>
+  <dlg:button dlg:id="cancel" dlg:tab-index="2" dlg:left="3" dlg:top="34" dlg:width="27" dlg:height="12" dlg:value="Cancel" dlg:button-type="cancel"/>
+  <dlg:button dlg:id="okay" dlg:tab-index="3" dlg:left="115" dlg:top="34" dlg:width="24" dlg:height="12" dlg:default="true" dlg:value="Ok" dlg:button-type="ok"/>
+ </dlg:bulletinboard>
+</dlg:window>

=== added file 'report_aeroo_ooo_plugin/plugin/dialogs/FilterChooser_en_US.properties'
--- report_aeroo_ooo_plugin/plugin/dialogs/FilterChooser_en_US.properties	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin/plugin/dialogs/FilterChooser_en_US.properties	2014-07-24 15:15:04 +0000
@@ -0,0 +1,1 @@
+options.filter=Saved filter to use

=== added file 'report_aeroo_ooo_plugin/plugin/odoo.png'
Binary files report_aeroo_ooo_plugin/plugin/odoo.png	1970-01-01 00:00:00 +0000 and report_aeroo_ooo_plugin/plugin/odoo.png	2014-07-24 15:15:04 +0000 differ
=== modified file 'report_aeroo_ooo_plugin/plugin/pythonpath/Localization.py'
--- __unported__/report_aeroo_ooo_plugin/plugin/pythonpath/Localization.py	2012-11-05 19:30:28 +0000
+++ report_aeroo_ooo_plugin/plugin/pythonpath/Localization.py	2014-07-24 15:15:04 +0000
@@ -49,7 +49,8 @@
             ]
         try:
             self.ctx = args[0]
-            self.config = self.getconfig('org.openerp.OpenERPOptions/ConfigNode')
+            self.config = self.getconfig(
+                'org.odoo.report_aeroo_ooo_plugin.OpenERPOptions/ConfigNode')
             self.initpath()
             self.initlanguage()
         except Exception, e:
@@ -79,9 +80,7 @@
                 self.loadlocalization()
             except Exception, e:
                 print e
-        print string
         if string not in self.localization: return 'unlocalized: %s' % string
-        print language
         if language in self.localization[string]:
             return self.localization[string][language]
         elif self.SUPPORTED_LANGUAGES[0] in self.localization[string]:
@@ -97,7 +96,6 @@
                     self.__class__.__name__
                     )
 	    for f in glob.glob(os.path.join(path, 'DialogStrings_*.properties')):
-                    print >> sys.stderr, f
 		    sf = os.path.split( f )[-1]
 		    lang = sf[sf.index( '_' )+1:sf.index( '_' )+3]
 		    for l in file( f ):
@@ -116,5 +114,6 @@
 # uno implementation
 g_ImplementationHelper = unohelper.ImplementationHelper()
 g_ImplementationHelper.addImplementation(
-    LocalizedObject, "org.openerp.LocalizedObject",
-    ("org.openerp.LocalizedObject",),)
+    LocalizedObject,
+    "org.odoo.report_aeroo_ooo_plugin.LocalizedObject",
+    ("org.odoo.report_aeroo_ooo_plugin.LocalizedObject",),)

=== modified file 'report_aeroo_ooo_plugin/plugin/pythonpath/OptionsHandler.py'
--- __unported__/report_aeroo_ooo_plugin/plugin/pythonpath/OptionsHandler.py	2012-07-09 13:47:10 +0000
+++ report_aeroo_ooo_plugin/plugin/pythonpath/OptionsHandler.py	2014-07-24 15:15:04 +0000
@@ -44,7 +44,8 @@
             "com.sun.star.configuration.ConfigurationProvider", ctx)
         self.node = uno.createUnoStruct("com.sun.star.beans.PropertyValue")
         self.node.Name = "nodepath"
-        self.node.Value = "/org.openerp.OpenERPOptions/OpenERPOptions"
+        self.node.Value = ("/org.odoo.report_aeroo_ooo_plugin.OpenERPOptions/"
+            "OpenERPOptions")
         self.cfg_names = [
             "Server",
             "ServerPort",
@@ -137,7 +138,7 @@
         return False
 
     def getImplementationName(self):
-        return "org.openerp.OptionsHandler"
+        return "org.odoo.report_aeroo_ooo_plugin.OptionsHandler"
 
     def getSupportedServiceNames(self):
         return ()
@@ -183,5 +184,5 @@
 # uno implementation
 g_ImplementationHelper = unohelper.ImplementationHelper()
 g_ImplementationHelper.addImplementation(
-    OptionsHandler, "org.openerp.OptionsHandler",
-    ("org.openerp.OptionsHandler",),)
+    OptionsHandler, "org.odoo.report_aeroo_ooo_plugin.OptionsHandler",
+    ("org.odoo.report_aeroo_ooo_plugin.OptionsHandler",),)

=== renamed directory '__unported__/report_aeroo_ooo_plugin/plugin/registry/data/org/openerp' => 'report_aeroo_ooo_plugin/plugin/registry/data/org/odoo'
=== added directory 'report_aeroo_ooo_plugin/plugin/registry/data/org/odoo/report_aeroo_ooo_plugin'
=== renamed directory '__unported__/report_aeroo_ooo_plugin/plugin/registry/data/org/openerp/Dialogs' => 'report_aeroo_ooo_plugin/plugin/registry/data/org/odoo/report_aeroo_ooo_plugin/Dialogs'
=== renamed file '__unported__/report_aeroo_ooo_plugin/plugin/registry/data/org/openerp/OpenERPOptions.xcu' => 'report_aeroo_ooo_plugin/plugin/registry/data/org/odoo/report_aeroo_ooo_plugin/OpenERPOptions.xcu'
--- __unported__/report_aeroo_ooo_plugin/plugin/registry/data/org/openerp/OpenERPOptions.xcu	2012-07-09 13:47:10 +0000
+++ report_aeroo_ooo_plugin/plugin/registry/data/org/odoo/report_aeroo_ooo_plugin/OpenERPOptions.xcu	2014-07-24 15:15:04 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-oor:name="OpenERPOptions" oor:package="org.openerp">
+oor:name="OpenERPOptions" oor:package="org.odoo.report_aeroo_ooo_plugin">
   <node oor:name="ConfigNode">
     <prop oor:name="Origin" oor:type="xs:string">
       <value>%origin%</value>

=== modified file 'report_aeroo_ooo_plugin/plugin/registry/data/org/openoffice/Office/Addons.xcu'
--- __unported__/report_aeroo_ooo_plugin/plugin/registry/data/org/openoffice/Office/Addons.xcu	2012-07-09 13:47:10 +0000
+++ report_aeroo_ooo_plugin/plugin/registry/data/org/openoffice/Office/Addons.xcu	2014-07-24 15:15:04 +0000
@@ -4,10 +4,10 @@
     oor:name="Addons" oor:package="org.openoffice.Office">
     <node oor:name="AddonUI">
         <node oor:name="OfficeMenuBar">
-            <node oor:name="org.openoffice.openerp.report.aeroo" oor:op="replace">
+            <node oor:name="org.odoo.report_aeroo_ooo_plugin.menu" oor:op="replace">
                 <prop oor:name="Title" oor:type="xs:string">
                     <value/>
-                    <value xml:lang="en-US">Aeroo (OpenERP)</value>
+                    <value xml:lang="en-US">Odoo</value>
                 </prop>
                 <prop oor:name="Target" oor:type="xs:string">
                     <value>_self</value>
@@ -18,7 +18,7 @@
                 <node oor:name="Submenu">
                     <node oor:name="m11aeroo1" oor:op="replace">
                         <prop oor:name="URL" oor:type="xs:string">
-                            <value>service:org.openoffice.openerp.report.aeroo.merge?execute</value>
+                            <value>service:org.odoo.report_aeroo_ooo_plugin.merge?execute</value>
                         </prop>
                         <prop oor:name="Title" oor:type="xs:string">
                             <value/>
@@ -42,7 +42,7 @@
                     </node>
                     <node oor:name="m51" oor:op="replace">
                         <prop oor:name="URL" oor:type="xs:string">
-                            <value>service:org.openoffice.openerp.report.aeroo.about?execute</value>
+                            <value>service:org.odoo.report_aeroo_ooo_plugin.about?execute</value>
                         </prop>
                         <prop oor:name="Title" oor:type="xs:string">
                             <value/>

=== modified file 'report_aeroo_ooo_plugin/plugin/registry/data/org/openoffice/Office/OptionsDialog.xcu'
--- __unported__/report_aeroo_ooo_plugin/plugin/registry/data/org/openoffice/Office/OptionsDialog.xcu	2012-07-09 13:47:10 +0000
+++ report_aeroo_ooo_plugin/plugin/registry/data/org/openoffice/Office/OptionsDialog.xcu	2014-07-24 15:15:04 +0000
@@ -3,19 +3,19 @@
    <node oor:name="Nodes">
     <node oor:name="Writer" oor:op="fuse">
         <node oor:name="Leaves">
-        <node oor:name="org.openerp.OpenERP" oor:op="fuse">
+        <node oor:name="org.odoo.report_aeroo_ooo_plugin.OpenERP" oor:op="fuse">
           <prop oor:name="Id">
-            <value>org.openerp.OpenERP</value>
+            <value>org.odoo.report_aeroo_ooo_plugin.OpenERP</value>
           </prop>
           <prop oor:name="Label">
-            <value xml:lang="en-US">OpenERP Options</value>
-            <value xml:lang="nl">OpenERP Instellingen</value>
+            <value xml:lang="en-US">Odoo Options</value>
+            <value xml:lang="nl">Odoo Instellingen</value>
           </prop>
           <prop oor:name="OptionsPage">
             <value>%origin%/../../../../../dialogs/OpenERPOptions.xdl</value>
           </prop>
 	  <prop oor:name="EventHandlerService">
-            <value>org.openerp.OptionsHandler</value>
+            <value>org.odoo.report_aeroo_ooo_plugin.OptionsHandler</value>
           </prop>
         </node>
       </node>

=== renamed directory '__unported__/report_aeroo_ooo_plugin/plugin/registry/schema/org/openerp' => 'report_aeroo_ooo_plugin/plugin/registry/schema/org/odoo'
=== added directory 'report_aeroo_ooo_plugin/plugin/registry/schema/org/odoo/report_aeroo_ooo_plugin'
=== renamed file '__unported__/report_aeroo_ooo_plugin/plugin/registry/schema/org/openerp/OpenERPOptions.xcs' => 'report_aeroo_ooo_plugin/plugin/registry/schema/org/odoo/report_aeroo_ooo_plugin/OpenERPOptions.xcs'
--- __unported__/report_aeroo_ooo_plugin/plugin/registry/schema/org/openerp/OpenERPOptions.xcs	2012-07-09 13:47:10 +0000
+++ report_aeroo_ooo_plugin/plugin/registry/schema/org/odoo/report_aeroo_ooo_plugin/OpenERPOptions.xcs	2014-07-24 15:15:04 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     oor:name="OpenERPOptions" oor:package="org.openerp" xml:lang="en-US">
+     oor:name="OpenERPOptions" oor:package="org.odoo.report_aeroo_ooo_plugin" xml:lang="en-US">
      <info>
          <author></author>
          <desc>Contains the options data used for the options OpenERP extension.</desc>
@@ -36,4 +36,4 @@
              </prop>
          </group>
      </component>
- </oor:component-schema>
\ No newline at end of file
+ </oor:component-schema>

=== added directory 'report_aeroo_ooo_plugin/plugin/template'
=== added directory 'report_aeroo_ooo_plugin/plugin/template/Odoo'
=== added file 'report_aeroo_ooo_plugin/plugin/template/Odoo/Partner mailmerge.ott'
Binary files report_aeroo_ooo_plugin/plugin/template/Odoo/Partner mailmerge.ott	1970-01-01 00:00:00 +0000 and report_aeroo_ooo_plugin/plugin/template/Odoo/Partner mailmerge.ott	2014-07-24 15:15:04 +0000 differ
=== added directory 'report_aeroo_ooo_plugin/static'
=== added directory 'report_aeroo_ooo_plugin/static/src'
=== added directory 'report_aeroo_ooo_plugin/static/src/img'
=== added file 'report_aeroo_ooo_plugin/static/src/img/icon.png'
Binary files report_aeroo_ooo_plugin/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and report_aeroo_ooo_plugin/static/src/img/icon.png	2014-07-24 15:15:04 +0000 differ
=== modified file 'report_aeroo_ooo_plugin/view/get_plugin.xml'
--- __unported__/report_aeroo_ooo_plugin/view/get_plugin.xml	2012-07-09 13:47:10 +0000
+++ report_aeroo_ooo_plugin/view/get_plugin.xml	2014-07-24 15:15:04 +0000
@@ -2,23 +2,25 @@
 <openerp>
     <data>
         <record id="view_get_plugin" model="ir.ui.view">
-            <field name="name">Plugin download form view</field>
             <field name="model">report.aeroo.get_plugin</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <field name="name" invisible="1"/>
-                    <field name="plugin_file" filename="name"/>
+                <form string="Plugin download form view" version="7.0">
+                    <group>
+                        <field name="name" invisible="1"/>
+                        <field name="plugin_file" filename="name"/>
+                    </group>
                 </form>
             </field>
         </record>
 
         <record id="wizard_get_plugin" model="ir.actions.act_window">
             <field name="name">Download Office Extension</field>
-	    <field name="type">ir.actions.act_window</field>
+            <field name="type">ir.actions.act_window</field>
             <field name="res_model">report.aeroo.get_plugin</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'bin_size': True}</field>
         </record>
 
         <menuitem name="Download Office Extension"