From 403ca77b8f1afd265f18bb49a6de7412da65d7ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 27 Jun 2012 12:12:56 +0200
Subject: [PATCH 01/16] [ADD] tools: added image.py, intended to hold the
 resize functions; also added in__init__.

bzr revid: tde@openerp.com-20120627101256-4q4miayorfcqh05w
---
 openerp/tools/__init__.py | 21 +++++++++++----------
 openerp/tools/image.py    | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 openerp/tools/image.py

diff --git a/openerp/tools/__init__.py b/openerp/tools/__init__.py
index 6875ebd78fc..76825060f31 100644
--- a/openerp/tools/__init__.py
+++ b/openerp/tools/__init__.py
@@ -19,19 +19,20 @@
 #
 ##############################################################################
 
-import copy
-import win32
-from config import config
-from misc import *
-from convert import *
-from translate import *
-from graph import graph
 from amount_to_text import *
 from amount_to_text_en import *
-from pdf_utils import *
-from yaml_import import *
-from sql import *
+from config import config
+from convert import *
+import copy
 from float_utils import *
+from graph import graph
+from image import *
+from misc import *
+from pdf_utils import *
+from sql import *
+from translate import *
+from yaml_import import *
+import win32
 
 #.apidoc title: Tools
 
diff --git a/openerp/tools/image.py b/openerp/tools/image.py
new file mode 100644
index 00000000000..4dc92704c9f
--- /dev/null
+++ b/openerp/tools/image.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-today OpenERP s.a. (<http://openerp.com>).
+#
+#    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 59ec75cbb0f1bc3385742134c03a85a111960ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 27 Jun 2012 15:27:39 +0200
Subject: [PATCH 02/16] [ADD] tools.images: added function to resize images.

bzr revid: tde@openerp.com-20120627132739-zdgvdqh2nbsfkyv7
---
 openerp/tools/image.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/openerp/tools/image.py b/openerp/tools/image.py
index 4dc92704c9f..edc251e40f6 100644
--- a/openerp/tools/image.py
+++ b/openerp/tools/image.py
@@ -18,3 +18,33 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
+import io
+from PIL import Image
+import StringIO
+
+def resize_image(base64_source, size=(1024, 1024), encoding='base64', filetype='PNG', avoid_if_small=False):
+    image_stream = io.BytesIO(base64_source.decode(encoding))
+    image = Image.open(image_stream)
+    # check image size: do not create a thumbnail if avoiding smaller images
+    if avoid_if_small and image.size[0] <= size[0] and image.size[1] <= size[1]:
+        return base64_source
+    # create a thumbnail: will resize and keep ratios
+    image.thumbnail(size, Image.ANTIALIAS)
+    # create a transparent image for background
+    background = Image.new('RGBA', size, (255, 255, 255, 0))
+    # past the resized image on the background
+    background.paste(image, ((size[0] - image.size[0]) / 2, (size[1] - image.size[1]) / 2))
+    # return an encoded image
+    background_stream = StringIO.StringIO()
+    background.save(background_stream, filetype)
+    return background_stream.getvalue().encode(encoding)
+
+def resize_image_big(base64_source, size=(1204, 1204), encoding='base64', filetype='PNG'):
+    return resize_image(base64_source, size, encoding, filetype, True)
+
+def resize_image_medium(base64_source, size=(180, 180), encoding='base64', filetype='PNG'):
+    return resize_image(base64_source, size, encoding, filetype)
+    
+def resize_image_small(base64_source, size=(50, 50), encoding='base64', filetype='PNG'):
+    return resize_image(base64_source, size, encoding, filetype)

From da294291cf00955581114848f38b244b98567492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 27 Jun 2012 15:28:07 +0200
Subject: [PATCH 03/16] [IMP] res.users: from avatar to image: iamge,
 image_medium and image_small, using tools to resize.

bzr revid: tde@openerp.com-20120627132807-crf2vi23ato69v47
---
 openerp/addons/base/res/res_users.py       | 93 +++++++++++++---------
 openerp/addons/base/res/res_users_view.xml |  4 +-
 2 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index e22b5addf48..969f455cef4 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -152,33 +152,6 @@ class users(osv.osv):
                                          body=(self.get_welcome_mail_body(cr, uid, context=context) % user))
         return ir_mail_server.send_email(cr, uid, msg, context=context)
 
-    def onchange_avatar(self, cr, uid, ids, value, context=None):
-        if not value:
-            return {'value': {'avatar_big': value, 'avatar': value} }
-        return {'value': {'avatar_big': self._avatar_resize(cr, uid, value, 540, 450, context=context), 'avatar': self._avatar_resize(cr, uid, value, context=context)} }
-    
-    def _set_avatar(self, cr, uid, id, name, value, args, context=None):
-        if not value:
-            vals = {'avatar_big': value}
-        else:
-            vals = {'avatar_big': self._avatar_resize(cr, uid, value, 540, 450, context=context)}
-        return self.write(cr, uid, [id], vals, context=context)
-    
-    def _avatar_resize(self, cr, uid, avatar, height=180, width=150, context=None):
-        image_stream = io.BytesIO(avatar.decode('base64'))
-        img = Image.open(image_stream)
-        img.thumbnail((height, width), Image.ANTIALIAS)
-        img_stream = StringIO.StringIO()
-        img.save(img_stream, "PNG")
-        return img_stream.getvalue().encode('base64')
-
-    def _get_avatar(self, cr, uid, ids, name, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for user in self.browse(cr, uid, ids, context=context):
-            if user.avatar_big:
-                result[user.id] = self._avatar_resize(cr, uid, user.avatar_big, context=context)
-        return result
-
     def _set_new_password(self, cr, uid, id, name, value, args, context=None):
         if value is False:
             # Do not update the password if no value is provided, ignore silently.
@@ -194,6 +167,35 @@ class users(osv.osv):
     def _get_password(self, cr, uid, ids, arg, karg, context=None):
         return dict.fromkeys(ids, '')
 
+    def _get_image_resized(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for user in self.browse(cr, uid, ids, context=context):
+            result[user.id] = {'image_medium': False, 'image_small': False}
+            if user.image:
+                result[user.id]['image_medium'] = tools.resize_image_medium(user.image)
+                result[user.id]['image_small'] = tools.resize_image_small(user.image)
+        return result
+    
+    def _set_image_resized(self, cr, uid, id, name, value, args, context=None):
+        if not value:
+            vals = {'image': value}
+        else:
+            vals = {'image': tools.resize_image_big(value)}
+        return self.write(cr, uid, [id], vals, context=context)
+    
+    def onchange_image(self, cr, uid, ids, value, context=None):
+        if not value:
+            return {'value': {
+                    'image': value,
+                    'image_medium': value,
+                    'image_small': value,
+                    }}
+        return {'value': {
+                    'image': tools.resize_image_big(value),
+                    'image_medium': tools.resize_image_medium(value),
+                    'image_small': tools.resize_image_small(value),
+                    }}
+    
     _columns = {
         'id': fields.integer('ID'),
         'name': fields.char('User Name', size=64, required=True, select=True,
@@ -208,11 +210,28 @@ class users(osv.osv):
                                                             "otherwise leave empty. After a change of password, the user has to login again."),
         'user_email': fields.char('Email', size=64),
         'signature': fields.text('Signature', size=64),
-        'avatar_big': fields.binary('Big-sized avatar', help="This field holds the image used as avatar for the user. The avatar field is used as an interface to access this field. The image is base64 encoded, and PIL-supported. It is stored as a 540x450 px image, in case a bigger image must be used."),
-        'avatar': fields.function(_get_avatar, fnct_inv=_set_avatar, string='Avatar', type="binary",
+        'image': fields.binary("Avatar",
+            help="This field holds the image used as avatar for the "\
+                 "user. The avatar field is used as an interface to "\
+                 "access this field. The image is base64 encoded, "\
+                 "and PIL-supported. It is stored as a 540x450 px "\
+                 "image, in case a bigger image must be used."),
+        'image_medium': fields.function(_get_image_resized, fnct_inv=_set_image_resized,
+            string="Medium-sized avatar", type="binary", multi="_get_image_resized",
             store = {
-                'res.users': (lambda self, cr, uid, ids, c={}: ids, ['avatar_big'], 10),
-            }, help="Image used as avatar for the user. It is automatically resized as a 180x150 px image. This field serves as an interface to the avatar_big field."),
+                'res.users': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Medium-sized image of the user. It is automatically "\
+                 "resized as a 180x180px image, with aspect ratio keps. "\
+                 "Use this field in form views or some kanban views."),
+        'image_small': fields.function(_get_image_resized, fnct_inv=_set_image_resized,
+            string="Smal-sized avatar", type="binary", multi="_get_image_resized",
+            store = {
+                'res.users': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Small-sized image of the user. It is automatically "\
+                 "resized as a 50x50px image, with aspect ratio keps. "\
+                 "Use this field in form views or some kanban views."),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),
         'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."),
@@ -321,16 +340,16 @@ class users(osv.osv):
             pass
         return result
 
-    def _get_avatar(self, cr, uid, context=None):
-        # default avatar file name: avatar0 -> avatar6.png, choose randomly
-        avatar_path = openerp.modules.get_module_resource('base', 'static/src/img', 'avatar%d.png' % random.randint(0, 6))
-        return self._avatar_resize(cr, uid, open(avatar_path, 'rb').read().encode('base64'), context=context)
+    def _get_image(self, cr, uid, context=None):
+        # default image file name: avatar0 -> avatar6.png, choose randomly
+        image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'avatar%d.png' % random.randint(0, 6))
+        return tools.resize_image_big(open(image_path, 'rb').read().encode('base64'))
 
     _defaults = {
         'password' : '',
         'context_lang': lambda self, cr, uid, context: context.get('lang', 'en_US'),
         'context_tz': lambda self, cr, uid, context: context.get('tz', False),
-        'avatar': _get_avatar,
+        'image': _get_image,
         'active' : True,
         'menu_id': _get_menu,
         'company_id': _get_company,
@@ -340,7 +359,7 @@ class users(osv.osv):
     }
 
     # User can write to a few of her own fields (but not her groups for example)
-    SELF_WRITEABLE_FIELDS = ['menu_tips','password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big']
+    SELF_WRITEABLE_FIELDS = ['menu_tips','password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'image', 'image_medium', 'image_small']
 
     def write(self, cr, uid, ids, values, context=None):
         if not hasattr(ids, '__iter__'):
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 82093dadd4b..28790a342a2 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -82,7 +82,7 @@
                     <field name="id" invisible="1"/>
                     <sheet>
                         <div class="oe_right">
-                            <field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" class="oe_avatar"/>
+                            <field name="image_medium" widget='image' nolabel="1" on_change="onchange_image(image_medium)" class="oe_avatar"/>
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
@@ -196,7 +196,7 @@
                 <form string="Users" version="7.0">
                    <sheet>
                     <div class="oe_right oe_avatar">
-                        <field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
+                        <field name="image_small" widget='image' on_change="onchange_image(image_small)"/>
                     </div>
                     <div class="oe_title">
                         <h1>

From 07c7817dbe01a21b5e22261eb3d19aec5deed88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 27 Jun 2012 16:48:16 +0200
Subject: [PATCH 04/16] [CLEAN] res.users: removed unnecessary imports; updated
 default image.

bzr revid: tde@openerp.com-20120627144816-64gwy6aszs4lv8ll
---
 openerp/addons/base/res/res_users.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 969f455cef4..d9c18b27dcb 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -25,7 +25,6 @@ from functools import partial
 
 import pytz
 
-import io, StringIO
 from lxml import etree
 from lxml.builder import E
 import netsvc
@@ -33,7 +32,6 @@ import openerp
 import openerp.exceptions
 from osv import fields,osv
 from osv.orm import browse_record
-from PIL import Image
 import pooler
 import random
 from service import security
@@ -349,7 +347,7 @@ class users(osv.osv):
         'password' : '',
         'context_lang': lambda self, cr, uid, context: context.get('lang', 'en_US'),
         'context_tz': lambda self, cr, uid, context: context.get('tz', False),
-        'image': _get_image,
+        'image_medium': _get_image,
         'active' : True,
         'menu_id': _get_menu,
         'company_id': _get_company,

From a30d405cff7031d05889fe4f2b6004e47e17c0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 27 Jun 2012 17:57:49 +0200
Subject: [PATCH 05/16] [IMP] res.users: cleaned a bit the code; res_partner:
 from photo to specified images; update res_company because of its logo coming
 from res.partner old photo.

bzr revid: tde@openerp.com-20120627155749-ms6p6d7z8c5u2gjg
---
 openerp/addons/base/res/res_company.py       |  2 +-
 openerp/addons/base/res/res_partner.py       | 69 +++++++++++++++++---
 openerp/addons/base/res/res_partner_view.xml | 10 +--
 openerp/addons/base/res/res_users.py         | 52 +++++++--------
 openerp/addons/base/res/res_users_view.xml   |  2 +-
 5 files changed, 90 insertions(+), 45 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 2454f342436..5e2e345632d 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -113,7 +113,7 @@ class res_company(osv.osv):
         'rml_header': fields.text('RML Header', required=True),
         'rml_header2': fields.text('RML Internal Header', required=True),
         'rml_header3': fields.text('RML Internal Header', required=True),
-        'logo': fields.related('partner_id', 'photo', string="Logo", type="binary"),
+        'logo': fields.related('partner_id', 'image_medium', string="Logo", type="binary"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
         'user_ids': fields.many2many('res.users', 'res_company_users_rel', 'cid', 'user_id', 'Accepted Users'),
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 1f4e11fca26..08cf19731c6 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -129,6 +129,33 @@ class res_partner(osv.osv):
             res[partner.id] =self._display_address(cr, uid, partner, context=context)
         return res
 
+    def _get_image(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = {'image_medium': False, 'image_small': False}
+            if obj.image:
+                result[obj.id]['image_medium'] = tools.resize_image_medium(obj.image)
+                result[obj.id]['image_small'] = tools.resize_image_small(obj.image)
+        return result
+    
+    def _set_image(self, cr, uid, id, name, value, args, context=None):
+        if value:
+            value = tools.resize_image_big(value)
+        return self.write(cr, uid, [id], {'image': value}, context=context)
+    
+    def onchange_image(self, cr, uid, ids, value, context=None):
+        if not value:
+            return {'value': {
+                        'image': value,
+                        'image_medium': value,
+                        'image_small': value,
+                        }}
+        return {'value': {
+                    'image': tools.resize_image_big(value),
+                    'image_medium': tools.resize_image_medium(value),
+                    'image_small': tools.resize_image_small(value),
+                    }}
+
     _order = "name"
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
@@ -170,7 +197,26 @@ class res_partner(osv.osv):
         'birthdate': fields.char('Birthdate', size=64),
         'is_company': fields.boolean('Company', help="Check if the contact is a company, otherwise it is a person"),
         'use_parent_address': fields.boolean('Use Company Address', help="Select this if you want to set company's address information  for this contact"),
-        'photo': fields.binary('Photo'),
+        'image': fields.binary("Avatar",
+            help="This field holds the image used as avatar for the "\
+                 "user. The image is base64 encoded, and PIL-supported. "\
+                 "It is limited to a 12024x1024 px image."),
+        'image_medium': fields.function(_get_image, fnct_inv=_set_image,
+            string="Medium-sized avatar", type="binary", multi="_get_image",
+            store = {
+                'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Medium-sized image of the user. It is automatically "\
+                 "resized as a 180x180px image, with aspect ratio kept. "\
+                 "Use this field in form views or some kanban views."),
+        'image_small': fields.function(_get_image, fnct_inv=_set_image,
+            string="Smal-sized avatar", type="binary", multi="_get_image",
+            store = {
+                'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Small-sized image of the user. It is automatically "\
+                 "resized as a 50x50px image, with aspect ratio keps. "\
+                 "Use this field anywhere a small image is required."),
         'company_id': fields.many2one('res.company', 'Company', select=1),
         'color': fields.integer('Color Index'),
         'contact_address': fields.function(_address_display,  type='char', string='Complete Address'),
@@ -183,12 +229,12 @@ class res_partner(osv.osv):
             return [context['category_id']]
         return False
 
-    def _get_photo(self, cr, uid, is_company, context=None):
+    def _get_default_image(self, cr, uid, is_company, context=None):
         if is_company:
-            path = os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'company_icon.png')
+            image_path = os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'company_icon.png')
         else:
-            path = os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'photo.png')
-        return open(path, 'rb').read().encode('base64')
+            image_path = os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'photo.png')
+        return tools.resize_image_big(open(image_path, 'rb').read().encode('base64'))
 
     _defaults = {
         'active': True,
@@ -199,7 +245,7 @@ class res_partner(osv.osv):
         'is_company': False,
         'type': 'default',
         'use_parent_address': True,
-        'photo': lambda self, cr, uid, context: self._get_photo(cr, uid, False, context),
+        'image': lambda self, cr, uid, context: self._get_default_image(cr, uid, False, context),
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -210,8 +256,9 @@ class res_partner(osv.osv):
         return super(res_partner, self).copy(cr, uid, id, default, context)
 
     def onchange_type(self, cr, uid, ids, is_company, context=None):
-        value = {'title': False,
-                 'photo': self._get_photo(cr, uid, is_company, context)}
+        # get value as for an onchange on the image
+        value = self.onchange_image(cr, uid, ids, self._get_default_image(cr, uid, is_company, context), context=context)['value']
+        value['title'] = False
         if is_company:
             value['parent_id'] = False
             domain = {'title': [('domain', '=', 'partner')]}
@@ -266,6 +313,7 @@ class res_partner(osv.osv):
                     domain_siblings = [('parent_id', '=', partner.parent_id.id), ('use_parent_address', '=', True)]
                     update_ids = [partner.parent_id.id] + self.search(cr, uid, domain_siblings, context=context)
             self.update_address(cr, uid, update_ids, vals, context)
+        print vals
         return super(res_partner,self).write(cr, uid, ids, vals, context=context)
 
     def create(self, cr, uid, vals, context=None):
@@ -276,8 +324,9 @@ class res_partner(osv.osv):
             domain_siblings = [('parent_id', '=', vals['parent_id']), ('use_parent_address', '=', True)]
             update_ids = [vals['parent_id']] + self.search(cr, uid, domain_siblings, context=context)
             self.update_address(cr, uid, update_ids, vals, context)
-        if 'photo' not in vals  :
-            vals['photo'] = self._get_photo(cr, uid, vals.get('is_company', False) or context.get('default_is_company'), context)
+        if 'image' not in vals :
+            image_value = self._get_default_image(cr, uid, vals.get('is_company', False) or context.get('default_is_company'), context)
+            vals.update(self.onchange_image(cr, uid, [], image_value, context=context))
         return super(res_partner,self).create(cr, uid, vals, context=context)
 
     def update_address(self, cr, uid, ids, vals, context=None):
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index aaab3a7d008..c31d061bcad 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -101,7 +101,7 @@
             <field name="arch" type="xml">
                 <form string="Partners" version="7.0">
                 <sheet>
-                    <field name="photo" widget='image' class="oe_avatar oe_right" height="70"/>
+                    <field name="image_small" widget='image' class="oe_avatar oe_right" on_change="onchange_image(image_small)" height="70"/>
                     <div class="oe_right oe_button_box" name="buttons">
 
                     </div>
@@ -180,7 +180,7 @@
                                     <field name="phone"/>
                                     <field name="street"/>
                                     <field name="street2"/>
-                                    <field name="photo"/>
+                                    <field name="image_small"/>
                                     <field name="zip"/>
                                     <field name="city"/>
                                     <field name="country_id"/>
@@ -193,7 +193,7 @@
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
                                                 <div class="oe_module_vignette">
                                                 <a type="edit">
-                                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/>
+                                                    <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/>
                                                 </a>
                                                     <div class="oe_module_desc">
                                                         <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
@@ -294,7 +294,7 @@
                     <field name="phone"/>
                     <field name="street"/>
                     <field name="street2"/>
-                    <field name="photo"/>
+                    <field name="image_small"/>
                     <field name="zip"/>
                     <field name="city"/>
                     <field name="country_id"/>
@@ -304,7 +304,7 @@
                         <t t-name="kanban-box">
                             <div class="oe_kanban_vignette">
                                 <a type="edit">
-                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_image"/>
+                                    <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_kanban_image"/>
                                 </a>
                                 <div class="oe_kanban_details">
                                       <h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a>
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index d9c18b27dcb..b983b12c744 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -165,29 +165,27 @@ class users(osv.osv):
     def _get_password(self, cr, uid, ids, arg, karg, context=None):
         return dict.fromkeys(ids, '')
 
-    def _get_image_resized(self, cr, uid, ids, name, args, context=None):
+    def _get_image(self, cr, uid, ids, name, args, context=None):
         result = dict.fromkeys(ids, False)
-        for user in self.browse(cr, uid, ids, context=context):
-            result[user.id] = {'image_medium': False, 'image_small': False}
-            if user.image:
-                result[user.id]['image_medium'] = tools.resize_image_medium(user.image)
-                result[user.id]['image_small'] = tools.resize_image_small(user.image)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = {'image_medium': False, 'image_small': False}
+            if obj.image:
+                result[obj.id]['image_medium'] = tools.resize_image_medium(obj.image)
+                result[obj.id]['image_small'] = tools.resize_image_small(obj.image)
         return result
     
-    def _set_image_resized(self, cr, uid, id, name, value, args, context=None):
-        if not value:
-            vals = {'image': value}
-        else:
-            vals = {'image': tools.resize_image_big(value)}
-        return self.write(cr, uid, [id], vals, context=context)
+    def _set_image(self, cr, uid, id, name, value, args, context=None):
+        if value:
+            value = tools.resize_image_big(value)
+        return self.write(cr, uid, [id], {'image': value}, context=context)
     
     def onchange_image(self, cr, uid, ids, value, context=None):
         if not value:
             return {'value': {
-                    'image': value,
-                    'image_medium': value,
-                    'image_small': value,
-                    }}
+                        'image': value,
+                        'image_medium': value,
+                        'image_small': value,
+                        }}
         return {'value': {
                     'image': tools.resize_image_big(value),
                     'image_medium': tools.resize_image_medium(value),
@@ -210,26 +208,24 @@ class users(osv.osv):
         'signature': fields.text('Signature', size=64),
         'image': fields.binary("Avatar",
             help="This field holds the image used as avatar for the "\
-                 "user. The avatar field is used as an interface to "\
-                 "access this field. The image is base64 encoded, "\
-                 "and PIL-supported. It is stored as a 540x450 px "\
-                 "image, in case a bigger image must be used."),
-        'image_medium': fields.function(_get_image_resized, fnct_inv=_set_image_resized,
-            string="Medium-sized avatar", type="binary", multi="_get_image_resized",
+                 "user. The image is base64 encoded, and PIL-supported. "\
+                 "It is limited to a 12024x1024 px image."),
+        'image_medium': fields.function(_get_image, fnct_inv=_set_image,
+            string="Medium-sized avatar", type="binary", multi="_get_image",
             store = {
                 'res.users': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the user. It is automatically "\
-                 "resized as a 180x180px image, with aspect ratio keps. "\
+                 "resized as a 180x180px image, with aspect ratio kept. "\
                  "Use this field in form views or some kanban views."),
-        'image_small': fields.function(_get_image_resized, fnct_inv=_set_image_resized,
-            string="Smal-sized avatar", type="binary", multi="_get_image_resized",
+        'image_small': fields.function(_get_image, fnct_inv=_set_image,
+            string="Smal-sized avatar", type="binary", multi="_get_image",
             store = {
                 'res.users': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the user. It is automatically "\
                  "resized as a 50x50px image, with aspect ratio keps. "\
-                 "Use this field in form views or some kanban views."),
+                 "Use this field anywhere a small image is required."),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),
         'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."),
@@ -338,7 +334,7 @@ class users(osv.osv):
             pass
         return result
 
-    def _get_image(self, cr, uid, context=None):
+    def _get_default_image(self, cr, uid, context=None):
         # default image file name: avatar0 -> avatar6.png, choose randomly
         image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'avatar%d.png' % random.randint(0, 6))
         return tools.resize_image_big(open(image_path, 'rb').read().encode('base64'))
@@ -347,7 +343,7 @@ class users(osv.osv):
         'password' : '',
         'context_lang': lambda self, cr, uid, context: context.get('lang', 'en_US'),
         'context_tz': lambda self, cr, uid, context: context.get('tz', False),
-        'image_medium': _get_image,
+        'image': _get_default_image,
         'active' : True,
         'menu_id': _get_menu,
         'company_id': _get_company,
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 28790a342a2..0b3ad957adb 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -82,7 +82,7 @@
                     <field name="id" invisible="1"/>
                     <sheet>
                         <div class="oe_right">
-                            <field name="image_medium" widget='image' nolabel="1" on_change="onchange_image(image_medium)" class="oe_avatar"/>
+                            <field name="image_small" widget='image' nolabel="1" on_change="onchange_image(image_small)" class="oe_avatar"/>
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>

From 423f4d8adff49523051524879f8506414a3a5b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 28 Jun 2012 10:30:39 +0200
Subject: [PATCH 06/16] [IMP] res_company logo: take the high-def image form
 res.partner.

bzr revid: tde@openerp.com-20120628083039-j0u50na78ean1yk9
---
 openerp/addons/base/res/res_company.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 5e2e345632d..42acbe163fb 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -113,7 +113,7 @@ class res_company(osv.osv):
         'rml_header': fields.text('RML Header', required=True),
         'rml_header2': fields.text('RML Internal Header', required=True),
         'rml_header3': fields.text('RML Internal Header', required=True),
-        'logo': fields.related('partner_id', 'image_medium', string="Logo", type="binary"),
+        'logo': fields.related('partner_id', 'image', string="Logo", type="binary"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
         'user_ids': fields.many2many('res.users', 'res_company_users_rel', 'cid', 'user_id', 'Accepted Users'),

From 931029d105cfe8d36a95b82103b613298ce675a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 28 Jun 2012 11:58:40 +0200
Subject: [PATCH 07/16] [IMP] tools/image.py: improved functions, take False
 case into account, made a tool function for orm methods; added coments.

bzr revid: tde@openerp.com-20120628095840-7sjcikxtmyuyc44n
---
 openerp/tools/image.py | 74 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/openerp/tools/image.py b/openerp/tools/image.py
index edc251e40f6..a5abdc826b3 100644
--- a/openerp/tools/image.py
+++ b/openerp/tools/image.py
@@ -23,7 +23,33 @@ import io
 from PIL import Image
 import StringIO
 
+# ----------------------------------------
+# Image resizing
+# ----------------------------------------
+
 def resize_image(base64_source, size=(1024, 1024), encoding='base64', filetype='PNG', avoid_if_small=False):
+    """ Function to resize an image. The image will be resized to the
+        given size, while keeping the aspect ratios, and holes in the
+        image will be filled with transparent background. The image
+        will not be stretched if smaller than the expected size.
+        Steps of the resizing:
+        - create a thumbnail of the source image through using the
+          thumbnail function. Aspect ratios are preserved when using
+          it. Note that if the source image is smaller than the expected
+          size, it will not be extended, but filled to match the size.
+        - create a transparent background that will hold the final
+          image.
+        - past the thumbnail on the transparent background and center
+          it.
+        
+        :param base64_source: base64-encoded version of the source
+                              image
+        :param size: tuple(height, width)
+        :param encoding: the output encoding
+        :param filetype: the output filetype
+        :param avoid_if_small: do not resize if image height and width
+                               are smaller than the expected size.
+    """
     image_stream = io.BytesIO(base64_source.decode(encoding))
     image = Image.open(image_stream)
     # check image size: do not create a thumbnail if avoiding smaller images
@@ -41,10 +67,58 @@ def resize_image(base64_source, size=(1024, 1024), encoding='base64', filetype='
     return background_stream.getvalue().encode(encoding)
 
 def resize_image_big(base64_source, size=(1204, 1204), encoding='base64', filetype='PNG'):
+    """ Wrapper on resize_image, to resize to the standard 'big' image
+        size: 1024x1024.
+        :param base64_source: base64 encoded source image. If False,
+                              the function returns False.
+    """
+    if not base64_source:
+        return False
     return resize_image(base64_source, size, encoding, filetype, True)
 
 def resize_image_medium(base64_source, size=(180, 180), encoding='base64', filetype='PNG'):
+    """ Wrapper on resize_image, to resize to the standard 'medium'
+        image size: 180x180.
+        :param base64_source: base64 encoded source image. If False,
+                              the function returns False.
+    """
+    if not base64_source:
+        return False
     return resize_image(base64_source, size, encoding, filetype)
     
 def resize_image_small(base64_source, size=(50, 50), encoding='base64', filetype='PNG'):
+    """ Wrapper on resize_image, to resize to the standard 'small' image
+        size: 50x50.
+        :param base64_source: base64 encoded source image. If False,
+                              the function returns False.
+    """
+    if not base64_source:
+        return False
     return resize_image(base64_source, size, encoding, filetype)
+
+# ----------------------------------------
+# Misc image tools
+# ---------------------------------------
+
+def get_resized_images(base64_source, big_name='image', medium_name='image_medium', small_name='image_small'):
+    """ Standard tool function that returns a dictionary containing the
+        big, medium and small versions of the source image. This function
+        is meant to be used for the methods of functional fields for
+        models using images.
+        
+        :param base64_source: if set to False, other values are set to
+                              False also. The purpose is to be linked
+                              to the fields that hold images in
+                              OpenERP and that are binary fields.
+        :param big_name: name related to the big version of the image;
+                         'image' by default
+        :param medium_name: name related to the medium version of the
+                            image; 'image_medium' by default
+        :param small_name: name related to the small version of the
+                           image; 'image_small' by default
+    """
+    return {
+        big_name: resize_image_big(base64_source),
+        medium_name: resize_image_medium(base64_source),
+        small_name: resize_image_small(base64_source),
+        }

From 35771b142c7a6fb79117d3c92bbd7b2b4db18627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 28 Jun 2012 11:59:10 +0200
Subject: [PATCH 08/16] [REF] res.users, res.partner: cleaned image related
 functions thanks to new tool function in image.py.

bzr revid: tde@openerp.com-20120628095910-1x1xyjw9li8y7778
---
 openerp/addons/base/res/res_partner.py | 27 ++++++++------------------
 openerp/addons/base/res/res_users.py   | 25 +++++++-----------------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index a38d434de88..7464df56b33 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -132,29 +132,18 @@ class res_partner(osv.osv):
     def _get_image(self, cr, uid, ids, name, args, context=None):
         result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = {'image_medium': False, 'image_small': False}
-            if obj.image:
-                result[obj.id]['image_medium'] = tools.resize_image_medium(obj.image)
-                result[obj.id]['image_small'] = tools.resize_image_small(obj.image)
+            resized_image_dict = tools.get_resized_images(obj.image)
+            result[obj.id] = {
+                'image_medium': resized_image_dict['image_medium'],
+                'image_small': resized_image_dict['image_small'],
+                }
         return result
     
     def _set_image(self, cr, uid, id, name, value, args, context=None):
-        if value:
-            value = tools.resize_image_big(value)
-        return self.write(cr, uid, [id], {'image': value}, context=context)
+        return self.write(cr, uid, [id], {'image': tools.resize_image_big(value)}, context=context)
     
     def onchange_image(self, cr, uid, ids, value, context=None):
-        if not value:
-            return {'value': {
-                        'image': value,
-                        'image_medium': value,
-                        'image_small': value,
-                        }}
-        return {'value': {
-                    'image': tools.resize_image_big(value),
-                    'image_medium': tools.resize_image_medium(value),
-                    'image_small': tools.resize_image_small(value),
-                    }}
+        return {'value': tools.get_resized_images(value)}
 
     _order = "name"
     _columns = {
@@ -326,7 +315,7 @@ class res_partner(osv.osv):
             self.update_address(cr, uid, update_ids, vals, context)
         if 'image' not in vals :
             image_value = self._get_default_image(cr, uid, vals.get('is_company', False) or context.get('default_is_company'), context)
-            vals.update(self.onchange_image(cr, uid, [], image_value, context=context))
+            vals.update(self.onchange_image(cr, uid, [], image_value, context=context)['value'])
         return super(res_partner,self).create(cr, uid, vals, context=context)
 
     def update_address(self, cr, uid, ids, vals, context=None):
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index b983b12c744..606d9c13aaf 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -168,29 +168,18 @@ class users(osv.osv):
     def _get_image(self, cr, uid, ids, name, args, context=None):
         result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = {'image_medium': False, 'image_small': False}
-            if obj.image:
-                result[obj.id]['image_medium'] = tools.resize_image_medium(obj.image)
-                result[obj.id]['image_small'] = tools.resize_image_small(obj.image)
+            resized_image_dict = tools.get_resized_images(obj.image)
+            result[obj.id] = {
+                'image_medium': resized_image_dict['image_medium'],
+                'image_small': resized_image_dict['image_small'],
+                }
         return result
     
     def _set_image(self, cr, uid, id, name, value, args, context=None):
-        if value:
-            value = tools.resize_image_big(value)
-        return self.write(cr, uid, [id], {'image': value}, context=context)
+        return self.write(cr, uid, [id], {'image': tools.resize_image_big(value)}, context=context)
     
     def onchange_image(self, cr, uid, ids, value, context=None):
-        if not value:
-            return {'value': {
-                        'image': value,
-                        'image_medium': value,
-                        'image_small': value,
-                        }}
-        return {'value': {
-                    'image': tools.resize_image_big(value),
-                    'image_medium': tools.resize_image_medium(value),
-                    'image_small': tools.resize_image_small(value),
-                    }}
+        return {'value': tools.get_resized_images(value)}
     
     _columns = {
         'id': fields.integer('ID'),

From 747d9b6540ee16a03a1a2fd81c62e20f5b021775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 28 Jun 2012 12:33:39 +0200
Subject: [PATCH 09/16] [REM] res_partner: removed a lost print statement.

bzr revid: tde@openerp.com-20120628103339-qvx0nk22pkyyseki
---
 openerp/addons/base/res/res_partner.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 7464df56b33..24f3b94b381 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -302,7 +302,6 @@ class res_partner(osv.osv):
                     domain_siblings = [('parent_id', '=', partner.parent_id.id), ('use_parent_address', '=', True)]
                     update_ids = [partner.parent_id.id] + self.search(cr, uid, domain_siblings, context=context)
             self.update_address(cr, uid, update_ids, vals, context)
-        print vals
         return super(res_partner,self).write(cr, uid, ids, vals, context=context)
 
     def create(self, cr, uid, vals, context=None):

From a3b94f96cc80b59014318eb51ff4c1a1c6378b53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 30 Jul 2012 11:51:33 +0200
Subject: [PATCH 10/16] [IMP] res.partner, res.users: fixed some typos/words in
 image related fields.

bzr revid: tde@openerp.com-20120730095133-7urnrolqywvrdntg
---
 openerp/addons/base/res/res_partner.py | 18 +++++++++---------
 openerp/addons/base/res/res_users.py   |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index f13d5fe42c3..156d7e70d35 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -190,25 +190,25 @@ class res_partner(osv.osv):
         'birthdate': fields.char('Birthdate', size=64),
         'is_company': fields.boolean('Company', help="Check if the contact is a company, otherwise it is a person"),
         'use_parent_address': fields.boolean('Use Company Address', help="Select this if you want to set company's address information  for this contact"),
-        'image': fields.binary("Avatar",
+        'image': fields.binary("Image",
             help="This field holds the image used as avatar for the "\
-                 "user. The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 12024x1024 px image."),
+                 "partner. The image is base64 encoded, and PIL-supported. "\
+                 "It is limited to a 1024x1024 px image."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
-            string="Medium-sized avatar", type="binary", multi="_get_image",
+            string="Medium-sized image", type="binary", multi="_get_image",
             store = {
                 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
-            help="Medium-sized image of the user. It is automatically "\
-                 "resized as a 180x180px image, with aspect ratio kept. "\
+            help="Medium-sized image of the partner. It is automatically "\
+                 "resized as a 180x180 px image, with aspect ratio kept. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
-            string="Smal-sized avatar", type="binary", multi="_get_image",
+            string="Small-sized image", type="binary", multi="_get_image",
             store = {
                 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
-            help="Small-sized image of the user. It is automatically "\
-                 "resized as a 50x50px image, with aspect ratio keps. "\
+            help="Small-sized image of the partner. It is automatically "\
+                 "resized as a 50x50 px image, with aspect ratio keps. "\
                  "Use this field anywhere a small image is required."),
         'company_id': fields.many2one('res.company', 'Company', select=1),
         'color': fields.integer('Color Index'),
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index c8c4b84af57..3af1764a7ae 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -198,14 +198,14 @@ class users(osv.osv):
         'image': fields.binary("Avatar",
             help="This field holds the image used as avatar for the "\
                  "user. The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 12024x1024 px image."),
+                 "It is limited to a 1024x1024 px image."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized avatar", type="binary", multi="_get_image",
             store = {
                 'res.users': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the user. It is automatically "\
-                 "resized as a 180x180px image, with aspect ratio kept. "\
+                 "resized as a 180x180 px image, with aspect ratio kept. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Smal-sized avatar", type="binary", multi="_get_image",
@@ -213,7 +213,7 @@ class users(osv.osv):
                 'res.users': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the user. It is automatically "\
-                 "resized as a 50x50px image, with aspect ratio keps. "\
+                 "resized as a 50x50 px image, with aspect ratio keps. "\
                  "Use this field anywhere a small image is required."),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),

From a403f06f5e882ba5a449b277c3f2bc5284d11322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 30 Jul 2012 15:33:28 +0200
Subject: [PATCH 11/16] [CLEAN] image help: cleaned typos.

bzr revid: tde@openerp.com-20120730133328-hpcwco5yb8iq9pgv
---
 openerp/addons/base/res/res_partner.py | 4 ++--
 openerp/addons/base/res/res_users.py   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 156d7e70d35..2d227a64fe1 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -200,7 +200,7 @@ class res_partner(osv.osv):
                 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the partner. It is automatically "\
-                 "resized as a 180x180 px image, with aspect ratio kept. "\
+                 "resized as a 180x180 px image, with aspect ratio preserved. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Small-sized image", type="binary", multi="_get_image",
@@ -208,7 +208,7 @@ class res_partner(osv.osv):
                 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the partner. It is automatically "\
-                 "resized as a 50x50 px image, with aspect ratio keps. "\
+                 "resized as a 50x50 px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
         'company_id': fields.many2one('res.company', 'Company', select=1),
         'color': fields.integer('Color Index'),
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 3af1764a7ae..496b0a944a1 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -205,7 +205,7 @@ class users(osv.osv):
                 'res.users': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the user. It is automatically "\
-                 "resized as a 180x180 px image, with aspect ratio kept. "\
+                 "resized as a 180x180 px image, with aspect ratio preserved. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Smal-sized avatar", type="binary", multi="_get_image",
@@ -213,7 +213,7 @@ class users(osv.osv):
                 'res.users': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the user. It is automatically "\
-                 "resized as a 50x50 px image, with aspect ratio keps. "\
+                 "resized as a 50x50 px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),

From 7034c5859658ff2e10d123333fb5f15a27229261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 3 Aug 2012 10:02:09 +0200
Subject: [PATCH 12/16] [IMP] res.users form view: used image is now
 image_medium, not image_small.

bzr revid: tde@openerp.com-20120803080209-2u43v6pfthkpmx4c
---
 openerp/addons/base/res/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 4346d03fda1..01b61927958 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -91,7 +91,7 @@
                 <form string="Users" version="7.0">
                     <field name="id" invisible="1"/>
                     <sheet>
-                        <field name="image_small" widget='image' on_change="onchange_image(image_small)" class="oe_avatar oe_left"/>
+                        <field name="image_medium" widget='image' on_change="onchange_image(image_medium)" class="oe_avatar oe_left"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>

From 176140590bc42b23627c4691ad07c7144028788a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 6 Aug 2012 17:53:25 +0200
Subject: [PATCH 13/16] [IMP] res_partner, res_users: removed the
 onchange_image, updated used images and classes in views.

bzr revid: tde@openerp.com-20120806155325-198jhpc2chmufzu1
---
 openerp/addons/base/res/res_partner.py       | 7 ++-----
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 openerp/addons/base/res/res_users.py         | 3 ---
 openerp/addons/base/res/res_users_view.xml   | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index e61b7b17a73..7b6841dedaa 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -145,9 +145,6 @@ class res_partner(osv.osv):
     
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.resize_image_big(value)}, context=context)
-    
-    def onchange_image(self, cr, uid, ids, value, context=None):
-        return {'value': tools.get_resized_images(value)}
 
     _order = "name"
     _columns = {
@@ -250,7 +247,7 @@ class res_partner(osv.osv):
 
     def onchange_type(self, cr, uid, ids, is_company, context=None):
         # get value as for an onchange on the image
-        value = self.onchange_image(cr, uid, ids, self._get_default_image(cr, uid, is_company, context), context=context)['value']
+        value = tools.get_resized_images(self._get_default_image(cr, uid, is_company, context))
         value['title'] = False
         if is_company:
             value['parent_id'] = False
@@ -318,7 +315,7 @@ class res_partner(osv.osv):
             self.update_address(cr, uid, update_ids, vals, context)
         if 'image' not in vals :
             image_value = self._get_default_image(cr, uid, vals.get('is_company', False) or context.get('default_is_company'), context)
-            vals.update(self.onchange_image(cr, uid, [], image_value, context=context)['value'])
+            vals.update(tools.get_resized_images(image_value))
         return super(res_partner,self).create(cr, uid, vals, context=context)
 
     def update_address(self, cr, uid, ids, vals, context=None):
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 0e8db3cc154..01c4649138a 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -99,7 +99,7 @@
             <field name="arch" type="xml">
                 <form string="Partners" version="7.0">
                 <sheet>
-                    <field name="image_small" widget='image' class="oe_avatar oe_left" on_change="onchange_image(image_small)"/>
+                    <field name="image_small" widget='image' class="oe_avatar oe_left"/>
                     <div class="oe_title">
                         <h1>
                             <field name="name" default_focus="1" placeholder="Name" />
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 496b0a944a1..32b0a7aec74 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -178,9 +178,6 @@ class users(osv.osv):
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.resize_image_big(value)}, context=context)
     
-    def onchange_image(self, cr, uid, ids, value, context=None):
-        return {'value': tools.get_resized_images(value)}
-    
     _columns = {
         'id': fields.integer('ID'),
         'name': fields.char('User Name', size=64, required=True, select=True,
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 01b61927958..5fcb83896cb 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -91,7 +91,7 @@
                 <form string="Users" version="7.0">
                     <field name="id" invisible="1"/>
                     <sheet>
-                        <field name="image_medium" widget='image' on_change="onchange_image(image_medium)" class="oe_avatar oe_left"/>
+                        <field name="image_medium" widget='image' class="oe_avatar oe_left"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
@@ -203,7 +203,7 @@
                 <form string="Users" version="7.0">
                    <sheet>
                     <div class="oe_right oe_avatar">
-                        <field name="image_small" widget='image' on_change="onchange_image(image_small)"/>
+                        <field name="image_small" widget='image' class="oe_image_small"/>
                     </div>
                     <h1>
                         <field name="name" readonly="1" class="oe_inline"/>

From 22d666584299b9e634e6ba51ffa4a98e260de2ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 7 Aug 2012 13:08:34 +0200
Subject: [PATCH 14/16] [CLEAN] [DOC] Pre-merge review: image: added comments.
 Also renamed functions, now prefixed with a image_* .

bzr revid: tde@openerp.com-20120807110834-uk3ymnxb5qz4hr8e
---
 openerp/tools/__init__.py | 18 ++++----
 openerp/tools/image.py    | 89 +++++++++++++++++++++++----------------
 2 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/openerp/tools/__init__.py b/openerp/tools/__init__.py
index 76825060f31..a6eeb14ba96 100644
--- a/openerp/tools/__init__.py
+++ b/openerp/tools/__init__.py
@@ -19,20 +19,20 @@
 #
 ##############################################################################
 
-from amount_to_text import *
-from amount_to_text_en import *
-from config import config
-from convert import *
 import copy
-from float_utils import *
+import win32
+from config import config
+from misc import *
+from convert import *
+from translate import *
 from graph import graph
 from image import *
-from misc import *
+from amount_to_text import *
+from amount_to_text_en import *
 from pdf_utils import *
-from sql import *
-from translate import *
 from yaml_import import *
-import win32
+from sql import *
+from float_utils import *
 
 #.apidoc title: Tools
 
diff --git a/openerp/tools/image.py b/openerp/tools/image.py
index a5abdc826b3..1caafb23a18 100644
--- a/openerp/tools/image.py
+++ b/openerp/tools/image.py
@@ -27,28 +27,34 @@ import StringIO
 # Image resizing
 # ----------------------------------------
 
-def resize_image(base64_source, size=(1024, 1024), encoding='base64', filetype='PNG', avoid_if_small=False):
-    """ Function to resize an image. The image will be resized to the
-        given size, while keeping the aspect ratios, and holes in the
-        image will be filled with transparent background. The image
-        will not be stretched if smaller than the expected size.
+def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', filetype='PNG', avoid_if_small=False):
+    """ Function to resize an image. The image will be resized to the given
+        size, while keeping the aspect ratios, and holes in the image will be
+        filled with transparent background. The image will not be stretched if
+        smaller than the expected size.
         Steps of the resizing:
-        - create a thumbnail of the source image through using the
-          thumbnail function. Aspect ratios are preserved when using
-          it. Note that if the source image is smaller than the expected
-          size, it will not be extended, but filled to match the size.
+        - if avoid_if_small: if both image sizes are smaller than the requested
+          sizes, the original image is returned. This is used to avoid adding
+          transparent content around images that we do not want to alter but
+          just resize if too big. This is used for example when storing images
+          in the 'image' field: we keep the original image, resized to a maximal
+          size, without adding transparent content around it if smaller.
+        - create a thumbnail of the source image through using the thumbnail
+          function. Aspect ratios are preserved when using it. Note that if the
+          source image is smaller than the expected size, it will not be
+          extended, but filled to match the size.
         - create a transparent background that will hold the final
           image.
         - past the thumbnail on the transparent background and center
           it.
         
         :param base64_source: base64-encoded version of the source
-                              image
+            image
         :param size: tuple(height, width)
         :param encoding: the output encoding
         :param filetype: the output filetype
         :param avoid_if_small: do not resize if image height and width
-                               are smaller than the expected size.
+            are smaller than the expected size.
     """
     image_stream = io.BytesIO(base64_source.decode(encoding))
     image = Image.open(image_stream)
@@ -66,59 +72,68 @@ def resize_image(base64_source, size=(1024, 1024), encoding='base64', filetype='
     background.save(background_stream, filetype)
     return background_stream.getvalue().encode(encoding)
 
-def resize_image_big(base64_source, size=(1204, 1204), encoding='base64', filetype='PNG'):
-    """ Wrapper on resize_image, to resize to the standard 'big' image
-        size: 1024x1024.
+def image_resize_image_big(base64_source, size=(1204, 1204), encoding='base64', filetype='PNG'):
+    """ Wrapper on image_resize_image, to resize images larger than the standard
+        'big' image size: 1024x1024px.
         :param base64_source: base64 encoded source image. If False,
-                              the function returns False.
+            the function returns False.
     """
     if not base64_source:
         return False
-    return resize_image(base64_source, size, encoding, filetype, True)
+    return image_resize_image(base64_source, size, encoding, filetype, True)
 
-def resize_image_medium(base64_source, size=(180, 180), encoding='base64', filetype='PNG'):
-    """ Wrapper on resize_image, to resize to the standard 'medium'
+def image_resize_image_medium(base64_source, size=(180, 180), encoding='base64', filetype='PNG'):
+    """ Wrapper on image_resize_image, to resize to the standard 'medium'
         image size: 180x180.
         :param base64_source: base64 encoded source image. If False,
-                              the function returns False.
+            the function returns False.
     """
     if not base64_source:
         return False
-    return resize_image(base64_source, size, encoding, filetype)
+    return image_resize_image(base64_source, size, encoding, filetype)
     
-def resize_image_small(base64_source, size=(50, 50), encoding='base64', filetype='PNG'):
-    """ Wrapper on resize_image, to resize to the standard 'small' image
+def image_resize_image_small(base64_source, size=(50, 50), encoding='base64', filetype='PNG'):
+    """ Wrapper on image_resize_image, to resize to the standard 'small' image
         size: 50x50.
         :param base64_source: base64 encoded source image. If False,
-                              the function returns False.
+            the function returns False.
     """
     if not base64_source:
         return False
-    return resize_image(base64_source, size, encoding, filetype)
+    return image_resize_image(base64_source, size, encoding, filetype)
 
 # ----------------------------------------
 # Misc image tools
 # ---------------------------------------
 
-def get_resized_images(base64_source, big_name='image', medium_name='image_medium', small_name='image_small'):
+def image_get_resized_images(base64_source, return_big=False, return_medium=True, return_small=True,
+    big_name='image', medium_name='image_medium', small_name='image_small'):
     """ Standard tool function that returns a dictionary containing the
         big, medium and small versions of the source image. This function
         is meant to be used for the methods of functional fields for
         models using images.
+
+        Default parameters are given to be used for the getter of functional
+        image fields,  for example with res.users or res.partner. It returns
+        only image_medium and image_small values, to update those fields.
         
-        :param base64_source: if set to False, other values are set to
-                              False also. The purpose is to be linked
-                              to the fields that hold images in
-                              OpenERP and that are binary fields.
+        :param base64_source: if set to False, other values are set to False
+            also. The purpose is to be linked to the fields that hold images in
+            OpenERP and that are binary fields.
+        :param return_big: if set, return_dict contains the 'big_name' entry
+        :param return_medium: if set, return_dict contains the 'medium_name' entry
+        :param return_small: if set, return_dict contains the 'small_name' entry
         :param big_name: name related to the big version of the image;
-                         'image' by default
+            'image' by default.
         :param medium_name: name related to the medium version of the
-                            image; 'image_medium' by default
+            image; 'image_medium' by default.
         :param small_name: name related to the small version of the
-                           image; 'image_small' by default
+            image; 'image_small' by default.
+        :return return_dict: dictionary with resized images, depending on
+            previous parameters.
     """
-    return {
-        big_name: resize_image_big(base64_source),
-        medium_name: resize_image_medium(base64_source),
-        small_name: resize_image_small(base64_source),
-        }
+    return_dict = dict()
+    if return_big: return_dict[big_name] = image_resize_image_big(base64_source)
+    if return_medium: return_dict[medium_name] = image_resize_image_medium(base64_source)
+    if return_small: return_dict[small_name] = image_resize_image_small(base64_source)
+    return return_dict
\ No newline at end of file

From 8b34f12ace7af624919f04b954506090c2dc8696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 7 Aug 2012 13:08:59 +0200
Subject: [PATCH 15/16] [IMP] res.users, res.partner: updated image code to
 propagate cleaning of image module.

bzr revid: tde@openerp.com-20120807110859-2osf4mf7y7by1zvm
---
 openerp/addons/base/res/res_partner.py       | 15 ++++++---------
 openerp/addons/base/res/res_partner_view.xml |  2 +-
 openerp/addons/base/res/res_users.py         | 10 +++-------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 7b6841dedaa..8648e7390d3 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -136,15 +136,12 @@ class res_partner(osv.osv):
     def _get_image(self, cr, uid, ids, name, args, context=None):
         result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
-            resized_image_dict = tools.get_resized_images(obj.image)
-            result[obj.id] = {
-                'image_medium': resized_image_dict['image_medium'],
-                'image_small': resized_image_dict['image_small'],
-                }
+            result[obj.id] = tools.image_get_resized_images(obj.image)
+            print result[obj.id]
         return result
     
     def _set_image(self, cr, uid, id, name, value, args, context=None):
-        return self.write(cr, uid, [id], {'image': tools.resize_image_big(value)}, context=context)
+        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
 
     _order = "name"
     _columns = {
@@ -224,7 +221,7 @@ class res_partner(osv.osv):
             image_path = os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'company_icon.png')
         else:
             image_path = os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'photo.png')
-        return tools.resize_image_big(open(image_path, 'rb').read().encode('base64'))
+        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
 
     _defaults = {
         'active': True,
@@ -247,7 +244,7 @@ class res_partner(osv.osv):
 
     def onchange_type(self, cr, uid, ids, is_company, context=None):
         # get value as for an onchange on the image
-        value = tools.get_resized_images(self._get_default_image(cr, uid, is_company, context))
+        value = tools.image_get_resized_images(self._get_default_image(cr, uid, is_company, context), return_big=True)
         value['title'] = False
         if is_company:
             value['parent_id'] = False
@@ -315,7 +312,7 @@ class res_partner(osv.osv):
             self.update_address(cr, uid, update_ids, vals, context)
         if 'image' not in vals :
             image_value = self._get_default_image(cr, uid, vals.get('is_company', False) or context.get('default_is_company'), context)
-            vals.update(tools.get_resized_images(image_value))
+            vals.update(tools.image_get_resized_images(image_value, return_big=True))
         return super(res_partner,self).create(cr, uid, vals, context=context)
 
     def update_address(self, cr, uid, ids, vals, context=None):
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 4448ec10b97..8e5ba29cc2a 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -181,7 +181,7 @@
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
                                                 <div class="oe_module_vignette">
                                                 <a type="edit">
-                                                    <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/>
+                                                    <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                 </a>
                                                     <div class="oe_module_desc">
                                                         <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 32b0a7aec74..6e15a6069db 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -168,15 +168,11 @@ class users(osv.osv):
     def _get_image(self, cr, uid, ids, name, args, context=None):
         result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
-            resized_image_dict = tools.get_resized_images(obj.image)
-            result[obj.id] = {
-                'image_medium': resized_image_dict['image_medium'],
-                'image_small': resized_image_dict['image_small'],
-                }
+            result[obj.id] = tools.image_get_resized_images(obj.image)
         return result
     
     def _set_image(self, cr, uid, id, name, value, args, context=None):
-        return self.write(cr, uid, [id], {'image': tools.resize_image_big(value)}, context=context)
+        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
     
     _columns = {
         'id': fields.integer('ID'),
@@ -322,7 +318,7 @@ class users(osv.osv):
     def _get_default_image(self, cr, uid, context=None):
         # default image file name: avatar0 -> avatar6.png, choose randomly
         image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'avatar%d.png' % random.randint(0, 6))
-        return tools.resize_image_big(open(image_path, 'rb').read().encode('base64'))
+        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
 
     _defaults = {
         'password' : '',

From a530fa9b2123abf4af25fd9dfbf7beed05e4730c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 7 Aug 2012 13:29:14 +0200
Subject: [PATCH 16/16] [REM] Removed a print statement.

bzr revid: tde@openerp.com-20120807112914-tjehrwyts1g20woe
---
 openerp/addons/base/res/res_partner.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 8648e7390d3..29e13b5642b 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -137,7 +137,6 @@ class res_partner(osv.osv):
         result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
             result[obj.id] = tools.image_get_resized_images(obj.image)
-            print result[obj.id]
         return result
     
     def _set_image(self, cr, uid, id, name, value, args, context=None):