diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 525c7e2e334..931cc6fe8b0 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1061,6 +1061,7 @@
+
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 0bfd1ba2c99..1e8c35c9500 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -124,7 +124,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.binary('Logo'),
+ 'logo': fields.related('partner_id', 'photo', string="Photo", 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'),
@@ -224,11 +224,12 @@ class res_company(osv.osv):
self._get_company_children.clear_cache(self)
def create(self, cr, uid, vals, context=None):
+
if not vals.get('name', False) or vals.get('partner_id', False):
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':1}, context=context)
+ partner_id = obj_partner.create(cr, uid, {'name': vals['name'],'is_company':True}, context=context)
vals.update({'partner_id': partner_id})
self.cache_restart(cr)
company_id = super(res_company, self).create(cr, uid, vals, context=context)
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index bbd5320a9b9..a6b93b865a4 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -406,7 +406,7 @@ class res_partner(osv.osv):
# get the information that will be injected into the display format
# get the address format
address_format = address.country_id and address.country_id.address_format or \
- '%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s'
+ '%(company_name)s\n%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s'
args = {
'state_code': address.state_id and address.state_id.code or '',
'state_name': address.state_id and address.state_id.name or '',
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 0b032fe4659..4c9d786f4d5 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -64,25 +64,22 @@
-
- Consumers
-
-
-
- Retailers
-
-
-
-
- Miscellaneous Suppliers
-
-
-
-
-
- Wood Suppliers
-
-
+
+ Consumers
+
+
+
+ Retailers
+
+
+
+ Miscellaneous Suppliers
+
+
+
+ Wood Suppliers
+
+