From c0d5a806824986284dd022e0478e57fc1e59feb7 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 31 Aug 2012 15:12:16 +0200 Subject: [PATCH] Random generation of default avatar bzr revid: mit@openerp.com-20120831131216-c5j02m8q7kwnn5pv --- openerp/addons/base/module/module_view.xml | 2 +- openerp/addons/base/res/res_partner.py | 31 ++++++++++++++++-- openerp/addons/base/res/res_partner_view.xml | 8 ++--- openerp/addons/base/static/src/img/avatar.png | Bin 0 -> 10341 bytes .../addons/base/static/src/img/avatar0.png | Bin 6910 -> 0 bytes .../addons/base/static/src/img/avatar1.png | Bin 5279 -> 0 bytes .../addons/base/static/src/img/avatar2.png | Bin 5340 -> 0 bytes .../addons/base/static/src/img/avatar3.png | Bin 5317 -> 0 bytes .../addons/base/static/src/img/avatar4.png | Bin 5323 -> 0 bytes .../addons/base/static/src/img/avatar5.png | Bin 5374 -> 0 bytes .../addons/base/static/src/img/avatar6.png | Bin 5452 -> 0 bytes .../base/static/src/img/partner_image.png | Bin 2723 -> 0 bytes setup.py | 2 +- 13 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 openerp/addons/base/static/src/img/avatar.png delete mode 100644 openerp/addons/base/static/src/img/avatar0.png delete mode 100644 openerp/addons/base/static/src/img/avatar1.png delete mode 100644 openerp/addons/base/static/src/img/avatar2.png delete mode 100644 openerp/addons/base/static/src/img/avatar3.png delete mode 100644 openerp/addons/base/static/src/img/avatar4.png delete mode 100644 openerp/addons/base/static/src/img/avatar5.png delete mode 100644 openerp/addons/base/static/src/img/avatar6.png delete mode 100644 openerp/addons/base/static/src/img/partner_image.png diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index 27eccf020b2..729d3ef7b4c 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -69,7 +69,7 @@
-

+


diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 93d12228ebe..f282466b989 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -227,10 +227,35 @@ class res_partner(osv.osv): def _get_default_image(self, cr, uid, is_company, context=None): if is_company: - image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png') + image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read() else: - image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'partner_image.png') - return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64')) +<<<<<<< TREE + from PIL import Image + from StringIO import StringIO + from random import random + color = (int(random() * 192 + 32), int(random() * 192 + 32), int(random() * 192 + 32)) + face = Image.open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')) + avatar = Image.new('RGB', face.size) + avatar.paste(color) + avatar.paste(face, mask=face) + buffer = StringIO() + avatar.save(buffer, 'PNG') + image = buffer.getvalue() + return tools.image_resize_image_big(image.encode('base64')) +======= + from PIL import Image + from StringIO import StringIO + from random import random + color = (int(random() * 256), int(random() * 256), int(random() * 256)) + face = open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read() + avatar = Image.new('RGB', face.size) + avatar.paste(color) + avatar.paste(face, mask=face) + buffer = StringIO() + avatar.save(buffer, 'PNG') + image = buffer.getvalue() + return tools.image_resize_image_big(image.encode('base64')) +>>>>>>> MERGE-SOURCE _defaults = { 'active': True, diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 92a264f0089..7e70e68c35c 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -176,7 +176,7 @@

X
- +
@@ -184,7 +184,7 @@ @@ -302,11 +302,11 @@
- +
-

+

-

+