From 2067192d37bf2c0aed78cc9576a2961e964b2139 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 24 Oct 2012 10:44:09 +0200 Subject: [PATCH] [IMP] rename columns for importation bzr revid: fp@tinyerp.com-20121024084409-ad4kuccw6bki3zdg --- openerp/addons/base/module/module.py | 3 +-- openerp/addons/base/res/res_partner.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 5fbb28d36db..3484b40cee9 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -418,13 +418,12 @@ class module(osv.osv): _, pool = pooler.restart_pool(cr.dbname, update_module=True) config = pool.get('res.config').next(cr, uid, [], context=context) or {} - if config.get('type') not in ('ir.actions.reload', 'ir.actions.act_window_close'): + if config.get('type') not in ('ir.actions.act_window_close',): return config # reload the client; open the first available root menu menu_obj = self.pool.get('ir.ui.menu') menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context) - return { 'type' : 'ir.actions.client', 'tag' : 'reload', diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 0c0e3398f88..9ed2333a23b 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -186,7 +186,7 @@ class res_partner(osv.osv, format_address): 'name': fields.char('Name', size=128, required=True, select=True), 'date': fields.date('Date', select=1), 'title': fields.many2one('res.partner.title', 'Title'), - 'parent_id': fields.many2one('res.partner', 'Company'), + 'parent_id': fields.many2one('res.partner', 'Related Company'), 'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'), 'ref': fields.char('Reference', size=64, select=1), 'lang': fields.selection(_lang_get, 'Language', @@ -229,7 +229,7 @@ class res_partner(osv.osv, format_address): 'fax': fields.char('Fax', size=64), 'mobile': fields.char('Mobile', size=64), 'birthdate': fields.char('Birthdate', size=64), - 'is_company': fields.boolean('Company', help="Check if the contact is a company, otherwise it is a person"), + 'is_company': fields.boolean('Is a Company', help="Check if the contact is a company, otherwise it is a person"), 'use_parent_address': fields.boolean('Use Company Address', help="Select this if you want to set company's address information for this contact"), # image: all image fields are base64 encoded and PIL-supported 'image': fields.binary("Image",