merge upstream

bzr revid: chs@openerp.com-20121024114831-5eyxqxd7y066v30d

diff --cc openerp/addons/base/module/module.py
index 8755be8,3484b40..5e3698f
--- 1/openerp/addons/base/module/module.py
--- 2/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@@ -233,28 -210,29 +233,28 @@@ class module(osv.osv)
  
          'url': fields.char('URL', size=128, readonly=True),
          'sequence': fields.integer('Sequence'),
 -        'dependencies_id': fields.one2many('ir.module.module.dependency',
 -            'module_id', 'Dependencies', readonly=True),
 +        'dependencies_id': fields.one2many('ir.module.module.dependency', 'module_id', 'Dependencies', readonly=True),
          'auto_install': fields.boolean('Automatic Installation',
 -            help='An auto-installable module is automatically installed by the '
 -            'system when all its dependencies are satisfied. '
 -            'If the module has no dependency, it is always installed.'),
 +                                       help='An auto-installable module is automatically installed by the '
 +                                            'system when all its dependencies are satisfied. '
 +                                            'If the module has no dependency, it is always installed.'),
          'state': fields.selection([
 -            ('uninstallable','Not Installable'),
 -            ('uninstalled','Not Installed'),
 -            ('installed','Installed'),
 -            ('to upgrade','To be upgraded'),
 -            ('to remove','To be removed'),
 -            ('to install','To be installed')
 +            ('uninstallable', 'Not Installable'),
 +            ('uninstalled', 'Not Installed'),
 +            ('installed', 'Installed'),
 +            ('to upgrade', 'To be upgraded'),
 +            ('to remove', 'To be removed'),
 +            ('to install', 'To be installed')
-         ], string='State', readonly=True, select=True),
+         ], string='Status', readonly=True, select=True),
          'demo': fields.boolean('Demo Data', readonly=True),
          'license': fields.selection([
 -                ('GPL-2', 'GPL Version 2'),
 -                ('GPL-2 or any later version', 'GPL-2 or later version'),
 -                ('GPL-3', 'GPL Version 3'),
 -                ('GPL-3 or any later version', 'GPL-3 or later version'),
 -                ('AGPL-3', 'Affero GPL-3'),
 -                ('Other OSI approved licence', 'Other OSI Approved Licence'),
 -                ('Other proprietary', 'Other Proprietary')
 +            ('GPL-2', 'GPL Version 2'),
 +            ('GPL-2 or any later version', 'GPL-2 or later version'),
 +            ('GPL-3', 'GPL Version 3'),
 +            ('GPL-3 or any later version', 'GPL-3 or later version'),
 +            ('AGPL-3', 'Affero GPL-3'),
 +            ('Other OSI approved licence', 'Other OSI Approved Licence'),
 +            ('Other proprietary', 'Other Proprietary')
          ], string='License', readonly=True),
          'menus_by_module': fields.function(_get_views, string='Menus', type='text', multi="meta", store=True),
          'reports_by_module': fields.function(_get_views, string='Reports', type='text', multi="meta", store=True),
@@@ -446,11 -424,10 +446,10 @@@
          # 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',
 -            'params' : {'menu_id' : menu_ids and menu_ids[0] or False}
 +            'type': 'ir.actions.client',
 +            'tag': 'reload',
 +            'params': {'menu_id': menu_ids and menu_ids[0] or False}
          }
  
      def button_immediate_uninstall(self, cr, uid, ids, context=None):
@@@ -746,14 -663,14 +745,14 @@@ class module_dependency(osv.osv)
          'module_id': fields.many2one('ir.module.module', 'Module', select=True, ondelete='cascade'),
  
          'state': fields.function(_state, type='selection', selection=[
 -            ('uninstallable','Uninstallable'),
 -            ('uninstalled','Not Installed'),
 -            ('installed','Installed'),
 -            ('to upgrade','To be upgraded'),
 -            ('to remove','To be removed'),
 -            ('to install','To be installed'),
 +            ('uninstallable', 'Uninstallable'),
 +            ('uninstalled', 'Not Installed'),
 +            ('installed', 'Installed'),
 +            ('to upgrade', 'To be upgraded'),
 +            ('to remove', 'To be removed'),
 +            ('to install', 'To be installed'),
              ('unknown', 'Unknown'),
-         ], string='State', readonly=True, select=True),
 -            ], string='Status', readonly=True, select=True),
++        ], string='Status', readonly=True, select=True),
      }
  
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: