Merge lp:~camptocamp/ocb-addons/7.0-webkit_report-image_helper-20130318 into lp:ocb-addons

[Yannick Vaucher @ Camptocamp]

In image helper, fix construction of image tag and improve it to let use other units than px (better to use mm and cm for reports)

This MP is a forward port of the following:
https://code.launchpad.net/~camptocamp/openobject-addons/6.0-webkit_report-image_helper-20120719
https://code.launchpad.net/~camptocamp/openobject-addons/6.1-webkit_report-image_helper-20120719

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

lines 10,29,34,35,42,43,53,60 contain meaningless whitespace changes. Can you please restore these lines from the original version of the file, to prevent unnecessary risk of conflicts?

review: Needs Fixing

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

And could you create a bug report, so that we can easily track upstream attempts at fixing this?

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Bug report created and linked

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

I have mixed feelings about this one, as it is not a "bug" but an enhancement. Allowing it will mean that some addons will not work at all with the official branch and work with this one (because they use a unit). IMO, it creates an unnecessary incompatibility.

Opinion?

review: Needs Information (philosophical musing)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

It shouldn't create incompatibility as the added argument "unit" is optional and if unset, it will be "px" still.

In my opinion, this will only make it available and we can make other webkit exemple header keeping the pixel sizes.

In fact, it will be useful for real custom reports, we do not care to have it yet example reports.
When you use webkit and set your logo you will have to create your own specific header and at that time you should be able to use a metric unit.

If you receive some corporation identities rules it will be in mm or cm and as you have only pixels, you will be cursing developers for each tries of conversion convert from cm to pixels.

So for the sake of developers who don't want to be haunted during there dreams, this should be accepted.

=== modified file 'report_webkit/report_helper.py'
--- report_webkit/report_helper.py	2012-12-06 14:56:32 +0000
+++ report_webkit/report_helper.py	2013-03-18 14:23:25 +0000
@@ -4,7 +4,7 @@
 # Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
 # All Right Reserved
 #
-# Author : Nicolas Bessi (Camptocamp)
+# Authors : Nicolas Bessi (Camptocamp)
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -39,19 +39,19 @@
         self.uid = uid
         self.pool = pooler.get_pool(self.cursor.dbname)
         self.report_id = report_id
-        
-    def embed_image(self, type, img, width=0, height=0) :
+
+    def embed_image(self, type, img, width=0, height=0, unit="px"):
         "Transform a DB image into an embedded HTML image"
 
         if width :
-            width = 'width="%spx"'%(width)
+            width = 'width: %s%s;'%(width, unit)
         else :
             width = ' '
         if height :
-            height = 'height="%spx"'%(height)
+            height = 'height: %s%s;'%(height, unit)
         else :
             height = ' '
-        toreturn = '<img %s %s src="data:image/%s;base64,%s" />'%(
+        toreturn = '<img style="%s%s" src="data:image/%s;base64,%s" />'%(
             width,
             height,
             type, 
@@ -59,14 +59,15 @@
         return toreturn
             
             
-    def get_logo_by_name(self, name):
+    def get_logo_by_name(self, name, company_id=None):
         """Return logo by name"""
         header_obj = self.pool.get('ir.header_img')
-        header_img_id = header_obj.search(
-                                            self.cursor, 
-                                            self.uid, 
-                                            [('name','=',name)]
-                                        )
+        domain = [('name','=',name)]
+        if company_id:
+            domain.append(('company_id', '=', company_id))
+        header_img_id = header_obj.search(self.cursor, 
+                                          self.uid, 
+                                          domain)
         if not header_img_id :
             return u''
         if isinstance(header_img_id, list):
@@ -75,10 +76,10 @@
         head = header_obj.browse(self.cursor, self.uid, header_img_id)
         return (head.img, head.type)
             
-    def embed_logo_by_name(self, name, width=0, height=0):
+    def embed_logo_by_name(self, name, width=0, height=0, unit="px", company_id=None):
         """Return HTML embedded logo by name"""
-        img, type = self.get_logo_by_name(name)
-        return self.embed_image(type, img, width, height)
+        img, type = self.get_logo_by_name(name, company_id=company_id)
+        return self.embed_image(type, img, width, height, unit)
         
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: