pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] lp:openobject-server

Browse Source 
bzr revid: jam@tinyerp.com-20120626035954-byl4pe03sogp793q
This commit is contained in:
Jigar Amin - OpenERP
2012-06-26 09:29:54 +05:30
parent 208f8c35bf 020ed6309f
commit c5e5d6180c
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/res/res_config.py
+10 -14
View File
@@ -496,15 +496,6 @@ class res_config_settings(osv.osv_memory):
return res
def fields_get(self, cr, uid, allfields=None, context=None, write_access=True):
# overridden to make fields of installed modules readonly
res = super(res_config_settings, self).fields_get(cr, uid, allfields, context, write_access)
classified = self._get_classified_fields(cr, uid, context)
for name, module in classified['module']:
if name in res and module.state in ('installed', 'to install', 'to upgrade'):
res[name]['readonly'] = True
return res
def execute(self, cr, uid, ids, context=None):
ir_values = self.pool.get('ir.values')
ir_model_data = self.pool.get('ir.model.data')
@@ -531,13 +522,18 @@ class res_config_settings(osv.osv_memory):
if method.startswith('set_'):
getattr(self, method)(cr, uid, ids, context)
# module fields: install immediately the selected modules
# module fields: install/uninstall the selected modules
to_install_ids = []
to_uninstall_ids = []
for name, module in classified['module']:
if config[name] and module.state == 'uninstalled':
to_install_ids.append(module.id)
if to_install_ids:
ir_module.button_immediate_install(cr, uid, to_install_ids, context)
if config[name]:
if module.state == 'uninstalled': to_install_ids.append(module.id)
else:
if module.state in ('installed','upgrade'): to_uninstall_ids.append(module.id)
if to_install_ids or to_uninstall_ids:
ir_module.button_uninstall(cr, uid, to_uninstall_ids, context=context)
ir_module.button_immediate_install(cr, uid, to_install_ids, context=context)
# force client-side reload (update user menu and current view)
return {
openerp/addons/base/res/res_partner.py
+12 -14
View File
@@ -289,19 +289,16 @@ class res_partner(osv.osv):
context = {}
if isinstance(ids, (int, long)):
ids = [ids]
if not ids:
return []
if context.get('show_ref'):
rec_name = 'ref'
else:
rec_name = 'name'
reads = self.read(cr, uid, ids, [rec_name,'parent_id'], context=context)
res = []
for record in reads:
name = record.get('name', '/')
if record['parent_id']:
name = "%s (%s)"%(name, record['parent_id'][1])
res.append((record['id'], name))
for record in self.browse(cr, uid, ids, context=context):
name = record.name
if record.parent_id:
name = "%s (%s)" % (name, record.parent_id.name)
if context.get('show_address'):
name = name + "\n" + self._display_address(cr, uid, record, without_company=True, context=context)
name = name.replace('\n\n','\n')
name = name.replace('\n\n','\n')
res.append((record.id, name))
return res
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
@@ -399,7 +396,7 @@ class res_partner(osv.osv):
('name','=','main_partner')])[0],
).res_id
def _display_address(self, cr, uid, address, context=None):
def _display_address(self, cr, uid, address, without_company=False, context=None):
'''
The purpose of this function is to build and return an address formatted accordingly to the
@@ -425,7 +422,8 @@ class res_partner(osv.osv):
address_field = ['title', 'street', 'street2', 'zip', 'city']
for field in address_field :
args[field] = getattr(address, field) or ''
if without_company:
args['company_name'] = ''
return address_format % args