From cc5d6e1b8628f4abbc2f82621b52d5f76d723a1e Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 19 Mar 2012 11:24:59 +0100 Subject: [PATCH] [REF] base, res_company: code optimization (partner_id is required on res.company) bzr revid: qdp-launchpad@openerp.com-20120319102459-bihu12q6tvizuay8 --- openerp/addons/base/res/res_company.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py index e6fcd92c298..d0e580160f9 100644 --- a/openerp/addons/base/res/res_company.py +++ b/openerp/addons/base/res/res_company.py @@ -223,12 +223,11 @@ 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':True}, 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) @@ -295,12 +294,12 @@ class res_company(osv.osv): [[ company.partner_id.name ]] - [[ company.partner_id and company.partner_id.street or '' ]] - [[ company.partner_id and company.partner_id.city or '' ]] - [[ company.partner_id and company.partner_id.country_id and company.partner_id.country_id.name or '']] + [[ company.partner_id.street or '' ]] + [[ company.partner_id.city or '' ]] - [[ company.partner_id.country_id and company.partner_id.country_id.name or '']] Phone: - [[ company.partner_id and company.partner_id.phone or '' ]] + [[ company.partner_id.phone or '' ]] Mail: - [[ company.partner_id and company.partner_id.email or '' ]] + [[ company.partner_id.email or '' ]] 1.3cm %s 7cm %s