[MERGE]

bzr revid: fp@openerp.com-20121102160310-ektb2rrpsfs3weq8

openerp/addons/base/__openerp__.py

@@ -91,6 +91,7 @@ The kernel of OpenERP, needed for all installation.
         'base_demo.xml',
         'res/res_partner_demo.xml',
         'res/res_partner_demo.yml',
+        'res/res_partner_image_demo.xml',
     ],
     'test': [
         'test/base_test.xml',

openerp/addons/base/res/res_company.py

@@ -235,7 +235,7 @@ class res_company(osv.osv):
             self.cache_restart(cr)
             return super(res_company, self).create(cr, uid, vals, context=context)
         obj_partner = self.pool.get('res.partner')
-        partner_id = obj_partner.create(cr, uid, {'name': vals['name'], 'is_company':True}, context=context)
+        partner_id = obj_partner.create(cr, uid, {'name': vals['name'], 'is_company':True, 'image': vals.get('logo', False), context=context)
         vals.update({'partner_id': partner_id})
         self.cache_restart(cr)
         company_id = super(res_company, self).create(cr, uid, vals, context=context)