Merge lp:~tadeus-prastowo/openobject-jasper-reports/7.0 into lp:openobject-jasper-reports

[Tadeus Prastowo]

Make jasper_reports module run under OpenERP version 7.0 upwards by adjusting the import statements to comply with OpenERP 7.0 explicit namespaces.

Unmerged revisions

182. By Eus on 2013-06-08

Adjust import statements to use OpenERP 7.0 explicit namespaces

181. By Eus on 2013-06-07

Incorporating latest updates to openobject-jasper-reports/6.0

180. By Omar (Pexego) on 2012-07-27

Merged Bruce Doan merge proposal that convert create xml template wizard to osv_memory

179. By Omar (Pexego) on 2012-07-27

[FIX] If first translation of attachments, user or special had blanks, output xmls were malformed

178. By Omar (Pexego) on 2012-03-07

[FIX] Web client doesn't pass 'model' in data dictionary, but it does context['active_model'].

177. By Omar (Pexego) on 2012-03-05

[ADD] bzr add __openerp__.py

176. By Omar (Pexego) on 2012-03-05

jasper_reports: Ported to 6.1

=== modified file 'jasper_reports/JasperReports/BrowseDataGenerator.py'
--- jasper_reports/JasperReports/BrowseDataGenerator.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/JasperReports/BrowseDataGenerator.py	2013-06-10 04:30:42 +0000
@@ -1,7 +1,12 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2008-2012 NaN Projectes de Programari Lliure, S.L.
 #                         http://www.NaN-tic.com
+# Copyright (c) 2012 Omar Castiñeira Saavedra <[e-mail]>
+#                         Pexego Sistemas Informáticos http://www.pexego.es
+# Copyright (C) 2013 Tadeus Prastowo <[e-mail]>
+#                         Vikasa Infinity Anugrah <http://www.infi-nity.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -31,10 +36,18 @@
 import copy
 import base64
 from xml.dom.minidom import getDOMImplementation
-import xml.dom.minidom
-from osv import orm, osv, fields
-import tempfile 
+
+try:
+    import release
+    from osv import orm, osv, fields
+except ImportError:
+    import openerp
+    from openerp import release
+    from openerp.osv import orm, osv, fields
+
+import tempfile
 import codecs
+import logging
 
 from JasperReport import *
 from AbstractDataGenerator import *
@@ -51,18 +64,11 @@
         self._languages = []
         self.imageFiles = {}
         self.temporaryFiles = []
+        self.logger = logging.getLogger(__name__)
 
-        try:
-            # Do not depend on being called inside OpenERP server
-            import netsvc
-            self.logger = netsvc.Logger()
-            self.WARNING = netsvc.LOG_WARNING
-        except:
-            self.logger = None
-    
     def warning(self, message):
         if self.logger:
-            self.logger.notifyChannel("jasper_reports", self.WARNING, message )
+            self.logger.warning("%s" % message)
         else:
             print 'JasperReports: %s' % message
 
@@ -85,6 +91,10 @@
             value = model.read(self.cr, self.uid, [id], [field], context=context)
             values[ language ] = value[0][field] or ''
 
+            if model._columns[field]._type == 'selection' and model._columns[field].selection:
+                field_data = model.fields_get(self.cr, self.uid, allfields=[field], context=context)
+                values[ language ] = dict(field_data[field]['selection']).get(values[ language ],values[ language ])
+
         result = []
         for key, value in values.iteritems():
             result.append( '%s~%s' % (key, value) )
@@ -124,7 +134,7 @@
             # If we wanted an INNER JOIN we wouldn't check for "value" and
             # return an empty currentRecords
             if value:
-                # Only 
+                # Only
                 newRecords = []
                 for v in value:
                     currentNewRecords = []
@@ -137,7 +147,7 @@
 
                 currentRecords = newRecords
         return currentRecords
-        
+
 class XmlBrowseDataGenerator(BrowseDataGenerator):
     # XML file generation works as follows:
     # By default (if no OPENERP_RELATIONS property exists in the report) a record will be created
@@ -229,7 +239,7 @@
             elif value == False:
                 value = ''
             elif field_type == 'date':
-                value = '%s 00:00:00' % str(value) 
+                value = '%s 00:00:00' % str(value)
             elif field_type == 'binary':
                 imageId = (record.id, field)
                 if imageId in self.imageFiles:
@@ -384,7 +394,7 @@
             elif value in (False,None):
                 value = ''
             elif field_type == 'date':
-                value = '%s 00:00:00' % str(value) 
+                value = '%s 00:00:00' % str(value)
             elif field_type == 'binary':
                 imageId = (record.id, field)
                 if imageId in self.imageFiles:

=== modified file 'jasper_reports/JasperReports/JasperReport.py'
--- jasper_reports/JasperReports/JasperReport.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/JasperReports/JasperReport.py	2013-06-10 04:30:42 +0000
@@ -1,7 +1,10 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2008-2012 NaN Projectes de Programari Lliure, S.L.
 #                         http://www.NaN-tic.com
+# Copyright (C) 2013 Tadeus Prastowo <[e-mail]>
+#                         Vikasa Infinity Anugrah <http://www.infi-nity.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -29,8 +32,16 @@
 import os
 from lxml import etree
 import re
-from tools.safe_eval import safe_eval
-import tools
+
+try:
+    import release
+    from tools.safe_eval import safe_eval
+    import tools
+except ImportError:
+    import openerp
+    from openerp import release
+    from openerp.tools.safe_eval import safe_eval
+    from openerp import tools
 
 dataSourceExpressionRegExp = re.compile( r"""\$P\{(\w+)\}""" )
 
@@ -121,10 +132,10 @@
             }
             fieldNames.append( name )
         return fields, fieldNames
-    
+
     def extractProperties(self):
         # The function will read all relevant information from the jrxml file
-            
+
         doc = etree.parse( self._reportPath )
 
         # Define namespaces
@@ -132,14 +143,14 @@
         nss = {'jr': ns}
 
         # Language
-        
+
         # Note that if either queryString or language do not exist the default (from the constructor)
         # is XPath.
         langTags = doc.xpath( '/jr:jasperReport/jr:queryString', namespaces=nss )
         if langTags:
             if langTags[0].get('language'):
                 self._language = langTags[0].get('language').lower()
-        
+
         # Relations
         relationTags = doc.xpath( '/jr:jasperReport/jr:property[@name="OPENERP_RELATIONS"]', namespaces=nss )
         if relationTags and 'value' in relationTags[0].keys():
@@ -209,7 +220,7 @@
             modelTags = tag.xpath( '//jr:reportElement/jr:property[@name="OPENERP_MODEL"]', namespaces=nss )
             if modelTags and 'value' in modelTags[0].keys():
                 model = modelTags[0].get('value')
-            
+
             pathPrefix = ''
             pathPrefixTags = tag.xpath( '//jr:reportElement/jr:property[@name="OPENERP_PATH_PREFIX"]', namespaces=nss )
             if pathPrefixTags and 'value' in pathPrefixTags[0].keys():
@@ -239,7 +250,7 @@
             })
             for subsubInfo in subreport.subreports():
                 subsubInfo['depth'] += 1
-                # Note hat 'parameter' (the one used to pass report's DataSource) must be 
+                # Note hat 'parameter' (the one used to pass report's DataSource) must be
                 # the same in all reports
                 self._subreports.append( subsubInfo )
 
@@ -294,7 +305,7 @@
             modelTags = tag.xpath( '../../jr:reportElement/jr:property[@name="OPENERP_MODEL"]', namespaces=nss )
             if modelTags and 'value' in modelTags[0].keys():
                 model = modelTags[0].get('value')
-            
+
             pathPrefix = ''
             pathPrefixTags = tag.xpath( '../../jr:reportElement/jr:property[@name="OPENERP_PATH_PREFIX"]', namespaces=nss )
             if pathPrefixTags and 'value' in pathPrefixTags[0].keys():

=== modified file 'jasper_reports/JasperReports/JasperServer.py'
--- jasper_reports/JasperReports/JasperServer.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/JasperReports/JasperServer.py	2013-06-10 04:30:42 +0000
@@ -1,7 +1,10 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2008-2012 NaN Projectes de Programari Lliure, S.L.
 #                         http://www.NaN-tic.com
+# Copyright (C) 2013 Tadeus Prastowo <[e-mail]>
+#                         Vikasa Infinity Anugrah <http://www.infi-nity.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -27,13 +30,22 @@
 ##############################################################################
 
 import os
-from osv import osv
 import glob
 import time
 import socket
 import subprocess
 import xmlrpclib
-from tools.translate import _
+import logging
+
+try:
+    import release
+    from osv import osv
+    from tools.translate import _
+except ImportError:
+    import openerp
+    from openerp import release
+    from openerp.osv import osv
+    from openerp.tools.translate import _
 
 class JasperServer:
     def __init__(self, port=8090):
@@ -41,18 +53,11 @@
         self.pidfile = None
         url = 'http://localhost:%d' % port
         self.proxy = xmlrpclib.ServerProxy( url, allow_none = True )
-
-        try:
-            # Do not depend on being called inside OpenERP server
-            import netsvc
-            self.logger = netsvc.Logger()
-            self.ERROR = netsvc.LOG_ERROR
-        except:
-            self.logger = None
+        self.logger = logging.getLogger(__name__)
 
     def error(self, message):
         if self.logger:
-            self.logger.notifyChannel("jasper_reports", self.ERROR, message )
+            self.logger.error("%s" % message )
         else:
             print 'JasperReports: %s' % message
 
@@ -73,14 +78,14 @@
         env['CLASSPATH'] = os.path.join( self.path(), '..', 'java' + sep ) + sep.join( glob.glob( libs ) ) + sep + os.path.join( self.path(), '..', 'custom_reports' )
         cwd = os.path.join( self.path(), '..', 'java' )
 
-        # Set headless = True because otherwise, java may use existing X session and if session is 
+        # Set headless = True because otherwise, java may use existing X session and if session is
         # closed JasperServer would start throwing exceptions. So we better avoid using the session at all.
         command = ['java', '-Djava.awt.headless=true', 'com.nantic.jasperreports.JasperServer', unicode(self.port)]
         process = subprocess.Popen(command, env=env, cwd=cwd)
         if self.pidfile:
             f = open( self.pidfile, 'w')
             try:
-                f.write( str( process.pid ) ) 
+                f.write( str( process.pid ) )
             finally:
                 f.close()
 
@@ -88,7 +93,7 @@
         """
         Render report and return the number of pages generated.
         """
-        try: 
+        try:
             return self.proxy.Report.execute( *args )
         except (xmlrpclib.ProtocolError, socket.error), e:
             #self.info("First try did not work: %s / %s" % (str(e), str(e.args)) )

=== modified file 'jasper_reports/JasperReports/RecordDataGenerator.py'
--- jasper_reports/JasperReports/RecordDataGenerator.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/JasperReports/RecordDataGenerator.py	2013-06-10 04:30:42 +0000
@@ -26,10 +26,8 @@
 #
 ##############################################################################
 
-import os
 import csv
 from xml.dom.minidom import getDOMImplementation
-import xml.dom.minidom
 import codecs
 
 from JasperReport import *

=== modified file 'jasper_reports/__init__.py'
--- jasper_reports/__init__.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/__init__.py	2013-06-10 04:30:42 +0000
@@ -1,7 +1,10 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2008-2012 NaN Projectes de Programari Lliure, S.L.
 #                         http://www.NaN-tic.com
+# Copyright (C) 2013 Tadeus Prastowo <[e-mail]>
+#                         Vikasa Infinity Anugrah <http://www.infi-nity.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -25,10 +28,17 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+
 from jasper_report import *
 from report_xml import *
 import wizard
 
-import release
-if release.major_version != '5.0':
-    from http_server import *
+try:
+    import release
+    if release.major_version != '5.0':
+        from http_server import *
+except ImportError:
+    import openerp
+    from openerp import release
+    if release.major_version != '5.0':
+        from openerp.service.http_server import *

=== added file 'jasper_reports/__openerp__.py'
--- jasper_reports/__openerp__.py	1970-01-01 00:00:00 +0000
+++ jasper_reports/__openerp__.py	2013-06-10 04:30:42 +0000
@@ -0,0 +1,57 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2008-2012 NaN Projectes de Programari Lliure, S.L.
+#                         http://www.NaN-tic.com
+# Copyright (C) 2013 Tadeus Prastowo <[e-mail]>
+#                         Vikasa Infinity Anugrah <http://www.infi-nity.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+{
+    "name" : "Jasper Reports",
+    "version" : "0.1.1",
+    "description" : "This module integrates Jasper Reports with OpenERP.",
+    "author" : "NaN·tic",
+    "website" : "http://www.nan-tic.com",
+    'images' : [
+        'images/jasper_reports-hover.png',
+        'images/jasper_reports.png'
+    ],
+    "depends" : ["base"],
+    "category" : "Generic Modules/Jasper Reports",
+    "init_xml" : [],
+    "demo_xml" : [
+        'jasper_demo.xml'
+    ],
+    "update_xml" : [
+        'wizard/jasper_create_data_template.xml',
+        'jasper_wizard.xml',
+        'report_xml_view.xml',
+        'security/ir.model.access.csv',
+    ],
+    "active": False,
+    "installable": True,
+    'application': True,
+}

=== removed file 'jasper_reports/__terp__.py'
--- jasper_reports/__terp__.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/__terp__.py	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2008-2012 NaN Projectes de Programari Lliure, S.L.
-#                         http://www.NaN-tic.com
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-{
-    "name" : "Jasper Reports",
-    "version" : "0.1",
-    "description" : "This module integrates Jasper Reports with OpenERP.",
-    "author" : "NaN·tic",
-    "website" : "http://www.nan-tic.com",
-    "depends" : ["base"],
-    "category" : "Generic Modules/Jasper Reports",
-    "init_xml" : [],
-    "demo_xml" : [ 
-        'jasper_demo.xml' 
-    ],
-    "update_xml" : [
-        'jasper_wizard.xml',
-        'report_xml_view.xml',
-        'security/ir.model.access.csv',
-    ],
-    "active": False,
-    "installable": True
-}
-

=== modified file 'jasper_reports/http_server.py'
--- jasper_reports/http_server.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/http_server.py	2013-06-10 04:30:42 +0000
@@ -1,7 +1,10 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2008-2012 NaN Projectes de Programari Lliure, S.L.
 #                         http://www.NaN-tic.com
+# Copyright (c) 2012 Omar Castiñeira Saavedra <[e-mail]>
+#                         Pexego Sistemas Informáticos http://www.pexego.es
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -26,9 +29,8 @@
 #
 ##############################################################################
 
-from service.http_server import reg_http_service, HttpDaemon
-from service.websrv_lib import HTTPDir
-from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+from service.http_server import reg_http_service
+from BaseHTTPServer import BaseHTTPRequestHandler
 import netsvc
 import tools
 
@@ -36,7 +38,7 @@
     def __init__(self):
         self.status = False
 
-class JasperHandler(netsvc.OpenERPDispatcher, BaseHTTPRequestHandler):
+class JasperHandler(BaseHTTPRequestHandler):
     cache = {}
 
     def __init__(self, request, client_address, server):
@@ -90,12 +92,12 @@
             'lang': language,
         }
 
-        uid = self.dispatch('common', 'login', (database, user, password) )
-        result = self.dispatch('object', 'execute', (database, uid, password, 'ir.actions.report.xml', 'create_xml', model, depth, context) )
+        uid = netsvc.dispatch_rpc('common', 'login', (database, user, password))
+        result = netsvc.dispatch_rpc('object', 'execute', (database, uid, password, 'ir.actions.report.xml', 'create_xml', model, depth, context))
 
         if use_cache:
             self.cache[key] = result
 
         return result
 
-reg_http_service(HTTPDir('/jasper/', JasperHandler))
+reg_http_service('/jasper/', JasperHandler)

=== added file 'jasper_reports/i18n/[e-mail]'
--- jasper_reports/i18n/[e-mail]	1970-01-01 00:00:00 +0000
+++ jasper_reports/i18n/[e-mail]	2013-06-10 04:30:42 +0000
@@ -0,0 +1,217 @@
+# Catalan (Valencian) translation for openobject-jasper-reports
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-jasper-reports package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-jasper-reports\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-06-27 14:39+0000\n"
+"PO-Revision-Date: 2013-01-08 19:18+0000\n"
+"Last-Translator: Pablo Fuentes Rodríguez (Studio73) <[e-mail]>\n"
+"Language-Team: Catalan (Valencian) <ca@[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-01-09 05:24+0000\n"
+"X-Generator: Launchpad (build 16412)\n"
+
+#. module: jasper_reports
+#: field:ir.actions.report.xml,jasper_report:0
+msgid "Is Jasper Report?"
+msgstr "Es Jasper Report?"
+
+#. module: jasper_reports
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"El nom de l'objecte ha de començar amb x_ i no pot contenir cap caràcter "
+"especial!"
+
+#. module: jasper_reports
+#: wizard_button:jasper_create_data_template,init,create:0
+msgid "Create"
+msgstr "Crea"
+
+#. module: jasper_reports
+#: field:ir.actions.report.xml,jasper_output:0
+msgid "Jasper Output"
+msgstr "Eixida de Jasper"
+
+#. module: jasper_reports
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom de model no vàlid en la definició de l'acció"
+
+#. module: jasper_reports
+#: selection:ir.actions.report.xml,jasper_output:0
+msgid "XLS"
+msgstr "XLS"
+
+#. module: jasper_reports
+#: view:ir.actions.report.xml:0
+#: field:ir.actions.report.xml,jasper_file_ids:0
+msgid "Files"
+msgstr "Fitxers"
+
+#. module: jasper_reports
+#: selection:ir.actions.report.xml,jasper_output:0
+msgid "RTF"
+msgstr "RTF"
+
+#. module: jasper_reports
+#: view:ir.actions.report.xml:0
+msgid "Update from attachments"
+msgstr "Actualitzar des d'adjunts"
+
+#. module: jasper_reports
+#: model:ir.actions.act_window,name:jasper_reports.ir_action_report_jasper
+#: view:ir.actions.report.xml:0
+#: model:ir.module.module,shortdesc:jasper_reports.module_meta_information
+#: model:ir.ui.menu,name:jasper_reports.jasper_reports_menu
+#: model:ir.ui.menu,name:jasper_reports.menu_ir_action_report_jasper
+msgid "Jasper Reports"
+msgstr "Jasper Reports"
+
+#. module: jasper_reports
+#: selection:ir.actions.report.xml,jasper_output:0
+msgid "ODS"
+msgstr ""
+
+#. module: jasper_reports
+#: selection:ir.actions.report.xml,jasper_output:0
+msgid "ODT"
+msgstr ""
+
+#. module: jasper_reports
+#: code:addons/jasper_reports/report_xml.py:0
+#, python-format
+msgid "There is more than one report marked as default"
+msgstr ""
+
+#. module: jasper_reports
+#: selection:ir.actions.report.xml,jasper_output:0
+msgid "HTML"
+msgstr ""
+
+#. module: jasper_reports
+#: code:addons/jasper_reports/wizard/create_data_template.py:0
+#, python-format
+msgid "User"
+msgstr ""
+
+#. module: jasper_reports
+#: view:ir.actions.report.xml:0
+msgid "Groups"
+msgstr ""
+
+#. module: jasper_reports
+#: field:ir.actions.report.xml.file,report_id:0
+msgid "Report"
+msgstr ""
+
+#. module: jasper_reports
+#: wizard_field:jasper_create_data_template,create,data:0
+msgid "XML"
+msgstr ""
+
+#. module: jasper_reports
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: jasper_reports
+#: model:ir.model,name:jasper_reports.model_ir_actions_report_xml_file
+msgid "ir.actions.report.xml.file"
+msgstr ""
+
+#. module: jasper_reports
+#: model:ir.actions.wizard,name:jasper_reports.jasper_create_data_template_action
+#: model:ir.ui.menu,name:jasper_reports.jasper_create_data_template_menu
+#: wizard_view:jasper_create_data_template,create:0
+#: wizard_view:jasper_create_data_template,init:0
+msgid "Create Data Template"
+msgstr ""
+
+#. module: jasper_reports
+#: field:ir.actions.report.xml.file,default:0
+msgid "Default"
+msgstr ""
+
+#. module: jasper_reports
+#: code:addons/jasper_reports/report_xml.py:0
+#, python-format
+msgid "No report has been marked as default."
+msgstr ""
+
+#. module: jasper_reports
+#: wizard_field:jasper_create_data_template,init,depth:0
+msgid "Depth"
+msgstr ""
+
+#. module: jasper_reports
+#: code:addons/jasper_reports/report_xml.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: jasper_reports
+#: selection:ir.actions.report.xml,jasper_output:0
+msgid "PDF"
+msgstr ""
+
+#. module: jasper_reports
+#: field:ir.actions.report.xml,jasper_model_id:0
+#: wizard_field:jasper_create_data_template,create,model:0
+#: wizard_field:jasper_create_data_template,init,model:0
+msgid "Model"
+msgstr ""
+
+#. module: jasper_reports
+#: selection:ir.actions.report.xml,jasper_output:0
+msgid "CSV"
+msgstr ""
+
+#. module: jasper_reports
+#: view:ir.actions.report.xml.file:0
+msgid "Jasper Reports File"
+msgstr ""
+
+#. module: jasper_reports
+#: code:addons/jasper_reports/wizard/create_data_template.py:0
+#, python-format
+msgid "Attachments"
+msgstr ""
+
+#. module: jasper_reports
+#: selection:ir.actions.report.xml,jasper_output:0
+msgid "Text"
+msgstr ""
+
+#. module: jasper_reports
+#: field:ir.actions.report.xml.file,filename:0
+#: wizard_field:jasper_create_data_template,create,filename:0
+msgid "File Name"
+msgstr ""
+
+#. module: jasper_reports
+#: wizard_button:jasper_create_data_template,create,end:0
+msgid "Accept"
+msgstr ""
+
+#. module: jasper_reports
+#: model:ir.module.module,description:jasper_reports.module_meta_information
+msgid "This module integrates Jasper Reports with OpenERP."
+msgstr ""
+
+#. module: jasper_reports
+#: field:ir.actions.report.xml.file,file:0
+msgid "File"
+msgstr ""
+
+#. module: jasper_reports
+#: wizard_button:jasper_create_data_template,init,end:0
+msgid "Cancel"
+msgstr ""

=== renamed file 'jasper_reports/i18n/[e-mail]' => 'jasper_reports/i18n/[e-mail]'
=== added directory 'jasper_reports/images'
=== added file 'jasper_reports/images/jasper_reports-hover.png'
Binary files jasper_reports/images/jasper_reports-hover.png	1970-01-01 00:00:00 +0000 and jasper_reports/images/jasper_reports-hover.png	2013-06-10 04:30:42 +0000 differ
=== added file 'jasper_reports/images/jasper_reports.png'
Binary files jasper_reports/images/jasper_reports.png	1970-01-01 00:00:00 +0000 and jasper_reports/images/jasper_reports.png	2013-06-10 04:30:42 +0000 differ
=== modified file 'jasper_reports/jasper_report.py'
--- jasper_reports/jasper_report.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/jasper_report.py	2013-06-10 04:30:42 +0000
@@ -1,7 +1,10 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2008-2012 NaN Projectes de Programari Lliure, S.L.
 #                         http://www.NaN-tic.com
+# Copyright (C) 2013 Tadeus Prastowo <[e-mail]>
+#                         Vikasa Infinity Anugrah <http://www.infi-nity.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -25,19 +28,26 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+
+try:
+    import release
+    import report
+    import pooler
+    from osv import orm, osv, fields
+    import tools
+    import netsvc
+except ImportError:
+    import openerp
+    from openerp import release
+    from openerp import report
+    from openerp import pooler
+    from openerp.osv import orm, osv, fields
+    from openerp import tools
+    from openerp import netsvc
+
 import os
-import csv
-import copy
-import base64
-import report
-import pooler
-from osv import orm, osv, fields
-import tools
-import tempfile 
-import codecs
-import sql_db
-import netsvc
-import release
+import tempfile
+import logging
 
 from JasperReports import *
 
@@ -57,7 +67,7 @@
         self.uid = uid
         self.ids = ids
         self.data = data
-        self.model = self.data['model']
+        self.model = self.data.get('model', False) or context.get('active_model', False)
         self.context = context or {}
         self.pool = pooler.get_pool( self.cr.dbname )
         self.reportPath = None
@@ -70,7 +80,7 @@
         If self.context contains "return_pages = True" it will return the number of pages
         of the generated report.
         """
-        logger = netsvc.Logger()
+        logger = logging.getLogger(__name__)
 
         # * Get report path *
         # Not only do we search the report by name but also ensure that 'report_rml' field
@@ -85,19 +95,21 @@
             self.outputFormat = data['jasper_output']
         self.reportPath = data['report_rml']
         self.reportPath = os.path.join( self.addonsPath(), self.reportPath )
+        if not os.path.lexists(self.reportPath):
+            self.reportPath = self.addonsPath(path=data['report_rml'])
 
         # Get report information from the jrxml file
-        logger.notifyChannel("jasper_reports", netsvc.LOG_INFO, "Requested report: '%s'" % self.reportPath)
+        logger.info("Requested report: '%s'" % self.reportPath)
         self.report = JasperReport( self.reportPath )
 
-        # Create temporary input (XML) and output (PDF) files 
+        # Create temporary input (XML) and output (PDF) files
         fd, dataFile = tempfile.mkstemp()
         os.close(fd)
         fd, outputFile = tempfile.mkstemp()
         os.close(fd)
         self.temporaryFiles.append( dataFile )
         self.temporaryFiles.append( outputFile )
-        logger.notifyChannel("jasper_reports", netsvc.LOG_INFO, "Temporary data file: '%s'" % dataFile)
+        logger.info("Temporary data file: '%s'" % dataFile)
 
         import time
         start = time.time()
@@ -110,7 +122,7 @@
                 generator = CsvBrowseDataGenerator( self.report, self.model, self.pool, self.cr, self.uid, self.ids, self.context )
             generator.generate( dataFile )
             self.temporaryFiles += generator.temporaryFiles
-        
+
         subreportDataFiles = []
         for subreportInfo in self.report.subreports():
             subreport = subreportInfo['report']
@@ -121,7 +133,7 @@
                 else:
                     message += 'without prefix '
                 message += 'for file %s' % subreportInfo['filename']
-                logger.notifyChannel("jasper_reports", netsvc.LOG_INFO, message)
+                logger.info("%s" % message)
 
                 fd, subreportDataFile = tempfile.mkstemp()
                 os.close(fd)
@@ -139,12 +151,12 @@
                 else:
                     generator = CsvBrowseDataGenerator( subreport, self.model, self.pool, self.cr, self.uid, self.ids, self.context )
                 generator.generate( subreportDataFile )
-                
+
 
         # Call the external java application that will generate the PDF file in outputFile
         pages = self.executeReport( dataFile, outputFile, subreportDataFiles )
         elapsed = (time.time() - start) / 60
-        logger.notifyChannel("jasper_reports", netsvc.LOG_INFO, "ELAPSED: '%f'" % elapsed )
+        logger.info("ELAPSED: %f" % elapsed)
 
         # Read data from the generated file and return it
         f = open( outputFile, 'rb')
@@ -159,8 +171,7 @@
                 try:
                     os.unlink( file )
                 except os.error, e:
-                    logger = netsvc.Logger()
-                    logger.notifyChannel("jasper_reports", netsvc.LOG_WARNING, "Could not remove file '%s'." % file )
+                    logger.warning("Could not remove file '%s'." % file )
         self.temporaryFiles = []
 
         if self.context.get('return_pages'):
@@ -171,7 +182,13 @@
     def path(self):
         return os.path.abspath(os.path.dirname(__file__))
 
-    def addonsPath(self):
+    def addonsPath(self, path=False):
+        if path:
+            report_module = path.split(os.path.sep)[0]
+            for addons_path in tools.config['addons_path'].split(','):
+                if os.path.lexists(addons_path+os.path.sep+report_module):
+                    return os.path.normpath( addons_path+os.path.sep+path )
+
         return os.path.dirname( self.path() )
 
     def systemUserName(self):
@@ -187,7 +204,7 @@
         port = tools.config['db_port'] or '5432'
         dbname = self.cr.dbname
         return 'jdbc:postgresql://%s:%s/%s' % ( host, port, dbname )
-    
+
     def userName(self):
         return tools.config['db_user'] or self.systemUserName()
 
@@ -196,7 +213,7 @@
 
     def executeReport(self, dataFile, outputFile, subreportDataFiles):
         locale = self.context.get('lang', 'en_US')
-        
+
         connectionParameters = {
             'output': self.outputFormat,
             #'xml': dataFile,
@@ -222,8 +239,8 @@
 class report_jasper(report.interface.report_int):
     def __init__(self, name, model, parser=None ):
         # Remove report name from list of services if it already
-        # exists to avoid report_int's assert. We want to keep the 
-        # automatic registration at login, but at the same time we 
+        # exists to avoid report_int's assert. We want to keep the
+        # automatic registration at login, but at the same time we
         # need modules to be able to use a parser for certain reports.
         if release.major_version == '5.0':
             if name in netsvc.SERVICES:
@@ -273,7 +290,7 @@
         report_jasper( name, model )
 
 
-    # This hack allows automatic registration of jrxml files without 
+    # This hack allows automatic registration of jrxml files without
     # the need for developers to register them programatically.
 
     old_register_all = report.interface.register_all

=== modified file 'jasper_reports/jasper_wizard.xml'
--- jasper_reports/jasper_wizard.xml	2009-08-29 22:32:12 +0000
+++ jasper_reports/jasper_wizard.xml	2013-06-10 04:30:42 +0000
@@ -1,13 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <record model="ir.actions.wizard" id="jasper_create_data_template_action">
-        <field name="name">Create Data Template</field>
-        <field name="wiz_name">jasper_create_data_template</field>
-    </record>
     <menuitem parent="base.menu_custom" name="Jasper Reports" id="jasper_reports_menu"/>
-    <menuitem parent="jasper_reports_menu"
-        action="jasper_create_data_template_action" id="jasper_create_data_template_menu"
-        type="wizard"/>
+	<menuitem
+            parent="jasper_reports_menu"
+            action="action_jasper_create_date_template"
+            id="jasper_create_data_template_menu" sequence="1" />        
 </data>
 </openerp>

=== modified file 'jasper_reports/report_xml.py'
--- jasper_reports/report_xml.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/report_xml.py	2013-06-10 04:30:42 +0000
@@ -3,6 +3,8 @@
 #
 # Copyright (c) 2008-2012 NaN Projectes de Programari Lliure, S.L.
 #                         http://www.NaN-tic.com
+# Copyright (C) 2013 Tadeus Prastowo <[e-mail]>
+#                         Vikasa Infinity Anugrah <http://www.infi-nity.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -28,25 +30,26 @@
 ##############################################################################
 
 import os
-import csv
-import copy
 import base64
-import report
-import pooler
-from osv import orm, osv, fields
-import tools
-import tempfile 
-import codecs
-import sql_db
-import netsvc
-import jasper_report
-from tools.translate import _
-
-import string
+
+try:
+    import release
+    import report
+    from osv import orm, osv, fields
+    import jasper_report
+    from tools.translate import _
+except ImportError:
+    import openerp
+    from openerp import release
+    from openerp import report
+    from openerp.osv import orm, osv, fields
+    from openerp import jasper_report
+    from openerp.tools.translate import _
+
 import unicodedata
 from xml.dom.minidom import getDOMImplementation
 
-src_chars = """ '"()/*-+?¿!&$[]{}@#`'^:;<>=~%,\\""" 
+src_chars = """ '"()/*-+?¿!&$[]{}@#`'^:;<>=~%,\\"""
 src_chars = unicode( src_chars, 'iso-8859-1' )
 dst_chars = """________________________________"""
 dst_chars = unicode( dst_chars, 'iso-8859-1' )
@@ -189,7 +192,7 @@
         model = pool.get(modelName)
         fields = model._columns.keys()
         fields += model._inherit_fields.keys()
-        # Remove duplicates because model may have fields with the 
+        # Remove duplicates because model may have fields with the
         # same name as it's parent
         fields = sorted( list( set( fields ) ) )
         for field in fields:
@@ -227,7 +230,7 @@
                     newName = model._inherit_fields[field][2]._obj
                 self.generate_xml(cr, uid, context, pool, newName, fieldNode, document, depth-1, False)
                 continue
-            
+
             if fieldType == 'float':
                 value = '12345.67'
             elif fieldType == 'integer':
@@ -246,18 +249,18 @@
 
         if depth > 1 and modelName != 'Attachments':
             # Create relation with attachments
-            fieldNode = document.createElement( '%s-Attachments' % _('Attachments') )
+            fieldNode = document.createElement( '%s-Attachments' % self.unaccent(_('Attachments')) )
             parentNode.appendChild( fieldNode )
             self.generate_xml(cr, uid, context, pool, 'ir.attachment', fieldNode, document, depth-1, False)
 
         if first_call:
             # Create relation with user
-            fieldNode = document.createElement( '%s-User' % _('User') )
+            fieldNode = document.createElement( '%s-User' % self.unaccent(_('User')) )
             parentNode.appendChild( fieldNode )
             self.generate_xml(cr, uid, context, pool, 'res.users', fieldNode, document, depth-1, False)
 
             # Create special entries
-            fieldNode = document.createElement( '%s-Special' % _('Special') )
+            fieldNode = document.createElement( '%s-Special' % self.unaccent(_('Special')) )
             parentNode.appendChild( fieldNode )
 
             newNode = document.createElement('copy')

=== added directory 'jasper_reports/static'
=== added directory 'jasper_reports/static/src'
=== added directory 'jasper_reports/static/src/img'
=== added file 'jasper_reports/static/src/img/icon.png'
Binary files jasper_reports/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and jasper_reports/static/src/img/icon.png	2013-06-10 04:30:42 +0000 differ
=== modified file 'jasper_reports/wizard/__init__.py'
--- jasper_reports/wizard/__init__.py	2009-01-03 20:36:32 +0000
+++ jasper_reports/wizard/__init__.py	2013-06-10 04:30:42 +0000
@@ -1,1 +1,1 @@
-import create_data_template
+import jasper_create_data_template

=== removed file 'jasper_reports/wizard/create_data_template.py'
--- jasper_reports/wizard/create_data_template.py	2011-06-13 15:17:43 +0000
+++ jasper_reports/wizard/create_data_template.py	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-# encoding: iso-8859-15
-import wizard
-import pooler
-import base64
-import osv
-from tools.translate import _
-
-view_form_start = """<?xml version="1.0"?>
-    <form string="Create Data Template">
-        <group colspan="2">
-            <field name="model"/>
-            <field name="depth"/>
-        </group>
-    </form>"""
-
-view_fields_start = {
-    'model': { 'string': 'Model', 'type': 'many2one', 'relation': 'ir.model', 'required': True },
-    'depth': { 'string':'Depth', 'type':'integer', 'required': True },
-}
-
-view_form_end = """<?xml version="1.0"?>
-    <form string="Create Data Template">
-        <group colspan="2">
-            <field name="model"/>
-            <field name="data" filename="filename"/>
-            <field name="filename" invisible="1"/>
-        </group>
-    </form>"""
-
-view_fields_end = {
-    'model': { 'string': 'Model', 'type': 'char', 'readonly': True },
-    'data': { 'string': 'XML', 'type': 'binary', 'relation': 'ir.model', 'readonly': True },
-    'filename': { 'string': 'File Name', 'type': 'char' },
-}
-
-class create_data_template(wizard.interface):
-    
-    def _action_start(self, cr, uid, data, context):
-        res = {
-            'depth': 1
-        }
-        return res
-
-    def _action_create_xml(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        form = data['form']
-        values = pool.get('ir.model').read(cr, uid, form['model'], ['name','model'], context)
-        name = values['name']
-        model = values['model']
-
-        
-        xml = pool.get('ir.actions.report.xml').create_xml(cr, uid, model, form['depth'], context)
-
-        return {
-            'model': name,
-            'data': base64.encodestring( xml ),
-            'filename': 'jasper.xml',
-        }
-
-    states = {
-        'init': {
-            'actions': [_action_start],
-            'result': {
-                'type': 'form', 
-                'arch': view_form_start, 
-                'fields': view_fields_start, 
-                'state': [('end','Cancel','gtk-cancel'),('create','Create','gtk-ok')]
-            }
-        },
-        'create': {
-            'actions': [_action_create_xml],
-            'result': {
-                'type': 'form', 
-                'arch': view_form_end, 
-                'fields': view_fields_end, 
-                'state': [('end','Accept','gtk-ok')]
-            }
-        }
-    }
-
-create_data_template('jasper_create_data_template')

=== added file 'jasper_reports/wizard/jasper_create_data_template.py'
--- jasper_reports/wizard/jasper_create_data_template.py	1970-01-01 00:00:00 +0000
+++ jasper_reports/wizard/jasper_create_data_template.py	2013-06-10 04:30:42 +0000
@@ -0,0 +1,70 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2012 Omar Castiñeira Saavedra <[e-mail]>
+#                         Pexego Sistemas Informáticos http://www.pexego.es
+# Copyright (C) 2013 Tadeus Prastowo <[e-mail]>
+#                         Vikasa Infinity Anugrah <http://www.infi-nity.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import base64
+
+try:
+    import release
+    import pooler
+    from osv import osv,fields
+    from tools.translate import _
+except ImportError:
+    import openerp
+    from openerp import release
+    from openerp import pooler
+    from openerp.osv import osv,fields
+    from openerp.tools.translate import _
+
+class create_data_template(osv.osv_memory):
+    _name = 'jasper.create.data.template'
+    _description = 'Create data template'
+
+    def action_create_xml(self, cr, uid, ids, context=None):
+        for data in  self.read(cr, uid, ids, context=context):
+            model = self.pool.get('ir.model').browse(cr, uid, data['model'][0], context=context)
+            xml = self.pool.get('ir.actions.report.xml').create_xml(cr, uid, model.model, data['depth'], context)
+            self.write(cr,uid,ids,{
+                'data' : base64.encodestring( xml ),
+                'filename': 'template.xml'
+            })
+        return True
+
+    _columns = {
+        'model': fields.many2one('ir.model', 'Model', required=True),
+        'depth': fields.integer("Depth", required=True),
+        'filename': fields.char('File Name', size=32),
+        'data': fields.binary('XML')
+    }
+
+    _defaults = {
+        'depth': 1
+    }
+create_data_template()

=== added file 'jasper_reports/wizard/jasper_create_data_template.xml'
--- jasper_reports/wizard/jasper_create_data_template.xml	1970-01-01 00:00:00 +0000
+++ jasper_reports/wizard/jasper_create_data_template.xml	2013-06-10 04:30:42 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_pos_box_out" model="ir.ui.view">
+            <field name="name">Create Data Template</field>
+            <field name="model">jasper.create.data.template</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form string="Create Data Template">
+				    <group colspan="2">
+				        <field name="model"/>
+				        <field name="depth"/>
+				        <field name="data" filename="filename" readonly="1" />
+				        <field name="filename" invisible="1"/>
+				    </group>
+				    <group colspan="4" col="4">
+                        <group col="2" colspan="2"/>
+                        <button name="action_create_xml" string="Create"
+                            colspan="1" type="object" icon="gtk-apply" />
+                        <button icon="gtk-stop" special="cancel"
+                            string="Close" />
+                    </group>
+				</form>
+            </field>
+        </record>
+
+        <record id="action_jasper_create_date_template" model="ir.actions.act_window">
+            <field name="name">Create Data Template</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">jasper.create.data.template</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file