odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

fix merge crap 

bzr revid: mit@openerp.com-20120831133133-5u2jvawyn6xkth91
This commit is contained in:
Minh Tran 2012-08-31 15:31:33 +02:00
parent c0d5a80682
commit a57ee611c4
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openerp/addons/base/res/res_partner.py
View File

@ -229,7 +229,6 @@ class res_partner(osv.osv):
if is_company:
image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read()
else:
<<<<<<< TREE
from PIL import Image
from StringIO import StringIO
from random import random
@ -242,20 +241,6 @@ class res_partner(osv.osv):
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,