Merge lp:openobject-jasper-reports/6.1 into lp:openobject-jasper-reports

[Bharati Soopal]

[lp:openobject-jasper-reports/6.1]

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

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

[Omar (Pexego) (omar7r)]

Each branch belongs to different openerp version and are not compatible

[Omar (Pexego) (omar7r)]

review: Disapprove

Unmerged revisions

181. By Omar (Pexego) on 2013-10-28

[IMP] Improves excel exportation, removing white lines created between pages, removing white columns, seting maximum rows per sheet and detecting cell type

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	2012-07-27 12:19:24 +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
@@ -31,10 +34,10 @@
 import copy
 import base64
 from xml.dom.minidom import getDOMImplementation
-import xml.dom.minidom
 from osv import orm, osv, fields
-import tempfile 
+import tempfile
 import codecs
+import logging
 
 from JasperReport import *
 from AbstractDataGenerator import *
@@ -51,18 +54,11 @@
         self._languages = []
         self.imageFiles = {}
         self.temporaryFiles = []
-
-        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
+        self.logger = logging.getLogger(__name__)
     
     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 +81,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) )

=== modified file 'jasper_reports/JasperReports/JasperServer.py'
--- jasper_reports/JasperReports/JasperServer.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/JasperReports/JasperServer.py	2012-07-27 12:19:24 +0000
@@ -34,6 +34,7 @@
 import subprocess
 import xmlrpclib
 from tools.translate import _
+import logging
 
 class JasperServer:
     def __init__(self, port=8090):
@@ -41,18 +42,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
 

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

=== added file 'jasper_reports/__openerp__.py'
--- jasper_reports/__openerp__.py	1970-01-01 00:00:00 +0000
+++ jasper_reports/__openerp__.py	2012-07-27 12:19:24 +0000
@@ -0,0 +1,49 @@
+##############################################################################
+#
+# 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
+}
+

=== 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	2012-07-27 12:19:24 +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)

=== modified file 'jasper_reports/jasper_report.py'
--- jasper_reports/jasper_report.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/jasper_report.py	2012-07-27 12:19:24 +0000
@@ -25,19 +25,16 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+
 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 tempfile
 import netsvc
 import release
+import logging
 
 from JasperReports import *
 
@@ -57,7 +54,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 +67,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,9 +82,11 @@
             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 
@@ -97,7 +96,7 @@
         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()
@@ -121,7 +120,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)
@@ -144,7 +143,7 @@
         # 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 +158,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 +169,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):

=== modified file 'jasper_reports/report_xml.py'
--- jasper_reports/report_xml.py	2012-03-04 01:25:44 +0000
+++ jasper_reports/report_xml.py	2012-07-27 12:19:24 +0000
@@ -28,21 +28,12 @@
 ##############################################################################
 
 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
 import unicodedata
 from xml.dom.minidom import getDOMImplementation
 
@@ -246,18 +237,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')