diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py index e0073d3f123..ac8e951e2a3 100644 --- a/bin/addons/__init__.py +++ b/bin/addons/__init__.py @@ -3,6 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2010 OpenERP s.a. (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -716,14 +717,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs): for kind in ('init', 'update'): if package.state=='to upgrade': # upgrading the module information - modobj.write(cr, 1, [mid], { - 'description': package.data.get('description', ''), - 'shortdesc': package.data.get('name', ''), - 'author': package.data.get('author', 'Unknown'), - 'website': package.data.get('website', ''), - 'license': package.data.get('license', 'GPL-2'), - 'certificate': package.data.get('certificate') or None, - }) + modobj.write(cr, 1, [mid], modobj.get_values_from_terp(package.data)) load_init_update_xml(cr, m, idref, mode, kind) load_data(cr, m, idref, mode) if hasattr(package, 'demo') or (package.dbdemo and package.state != 'installed'): diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py index 8685bf6c342..2308ecfccc8 100644 --- a/bin/addons/base/__openerp__.py +++ b/bin/addons/base/__openerp__.py @@ -3,6 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2010 OpenERP s.a. (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -25,7 +26,8 @@ 'version': '1.2', 'category': 'Generic Modules/Base', 'description': """The kernel of OpenERP, needed for all installation.""", - 'author': 'Tiny', + 'author': 'OpenERP s.a.', + 'maintainer': 'OpenERP s.a.', 'website': 'http://www.openerp.com', 'depends': [], 'init_xml': [ diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py index 2372a09405f..5bc12432d4e 100644 --- a/bin/addons/base/module/module.py +++ b/bin/addons/base/module/module.py @@ -3,6 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2010 OpenERP s.a. (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -123,6 +124,8 @@ class module(osv.osv): 'shortdesc': fields.char('Short Description', size=256, readonly=True, translate=True), 'description': fields.text("Description", readonly=True, translate=True), 'author': fields.char("Author", size=128, readonly=True), + 'maintainer': fields.char('Maintainer', size=128, readonly=True), + 'contributors': fields.text('Contributors', readonly=True), 'website': fields.char("Website", size=256, readonly=True), # attention: Incorrect field names !! @@ -306,6 +309,19 @@ class module(osv.osv): self.update_translations(cr, uid, ids) return True + @staticmethod + def get_values_from_terp(terp): + return { + 'description': terp.get('description', ''), + 'shortdesc': terp.get('name', ''), + 'author': terp.get('author', 'Unknown'), + 'maintainer': terp.get('maintainer', False), + 'contributors': ', '.join(terp.get('contributors', [])), + 'website': terp.get('website', ''), + 'license': terp.get('license', 'GPL-2'), + 'certificate': terp.get('certificate') or None, + } + # update the list of available packages def update_list(self, cr, uid, context={}): res = [0, 0] # [update, add] @@ -313,46 +329,31 @@ class module(osv.osv): # iterate through installed modules and mark them as being so for mod_name in addons.get_modules(): ids = self.search(cr, uid, [('name','=',mod_name)]) + + terp = self.get_module_info(mod_name) + values = self.get_values_from_terp(terp) + if ids: id = ids[0] mod = self.browse(cr, uid, id) - terp = self.get_module_info(mod_name) if terp.get('installable', True) and mod.state == 'uninstallable': self.write(cr, uid, id, {'state': 'uninstalled'}) if parse_version(terp.get('version', '')) > parse_version(mod.latest_version or ''): self.write(cr, uid, id, { 'url': ''}) res[0] += 1 - self.write(cr, uid, id, { - 'description': terp.get('description', ''), - 'shortdesc': terp.get('name', ''), - 'author': terp.get('author', 'Unknown'), - 'website': terp.get('website', ''), - 'license': terp.get('license', 'GPL-2'), - 'certificate': terp.get('certificate') or None, - }) + self.write(cr, uid, id, values) cr.execute('DELETE FROM ir_module_module_dependency WHERE module_id = %s', (id,)) - self._update_dependencies(cr, uid, ids[0], terp.get('depends', [])) - self._update_category(cr, uid, ids[0], terp.get('category', 'Uncategorized')) - continue - mod_path = addons.get_module_path(mod_name) - if mod_path: - terp = self.get_module_info(mod_name) + else: + mod_path = addons.get_module_path(mod_name) + if not mod_path: + continue if not terp or not terp.get('installable', True): continue - id = self.create(cr, uid, { - 'name': mod_name, - 'state': 'uninstalled', - 'description': terp.get('description', ''), - 'shortdesc': terp.get('name', ''), - 'author': terp.get('author', 'Unknown'), - 'website': terp.get('website', ''), - 'license': terp.get('license', 'GPL-2'), - 'certificate': terp.get('certificate') or None, - }) + id = self.create(cr, uid, dict(name=mod_name, state='uninstalled', **values)) res[1] += 1 - self._update_dependencies(cr, uid, id, terp.get('depends', [])) - self._update_category(cr, uid, id, terp.get('category', 'Uncategorized')) + self._update_dependencies(cr, uid, id, terp.get('depends', [])) + self._update_category(cr, uid, id, terp.get('category', 'Uncategorized')) return res @@ -379,14 +380,7 @@ class module(osv.osv): except Exception, e: raise orm.except_orm(_('Error'), _('Can not create the module file:\n %s') % (fname,)) terp = self.get_module_info(mod.name) - self.write(cr, uid, mod.id, { - 'description': terp.get('description', ''), - 'shortdesc': terp.get('name', ''), - 'author': terp.get('author', 'Unknown'), - 'website': terp.get('website', ''), - 'license': terp.get('license', 'GPL-2'), - 'certificate': terp.get('certificate') or None, - }) + self.write(cr, uid, mod.id, self.get_values_from_terp(terp)) cr.execute('DELETE FROM ir_module_module_dependency ' \ 'WHERE module_id = %s', (mod.id,)) self._update_dependencies(cr, uid, mod.id, terp.get('depends', diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml index cd57b59023c..5a64360b01d 100644 --- a/bin/addons/base/module/module_view.xml +++ b/bin/addons/base/module/module_view.xml @@ -95,10 +95,16 @@ - - - - + + + + + + + + + + @@ -141,6 +147,8 @@ + + diff --git a/bin/addons/base/module/wizard/add_new.py b/bin/addons/base/module/wizard/add_new.py index 0e2028e7624..c6eddab2adb 100644 --- a/bin/addons/base/module/wizard/add_new.py +++ b/bin/addons/base/module/wizard/add_new.py @@ -3,6 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2010 OpenERP s.a. (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -56,7 +57,7 @@ class wizard_install_module(wizard.interface): terp = mod_obj.get_module_info(module) if not terp.get('installable', True): continue - + # XXX check if this code is correct... fm = imp.find_module(module) try: @@ -65,12 +66,8 @@ class wizard_install_module(wizard.interface): if fm[0]: fm[0].close() - mod_id = mod_obj.create(cr, uid, { - 'name': module, - 'state': 'uninstalled', - 'description': terp.get('description', ''), - 'shortdesc': terp.get('name', ''), - 'author': terp.get('author', 'Unknown')}) + values = mod_obj.get_values_from_terp(terp) + mod_id = mod_obj.create(cr, uid, dict(name=module, state='uninstalled', **values)) dependencies = terp.get('depends', []) for d in dependencies: cr.execute('insert into ir_module_module_dependency (module_id,name) values (%s, %s)', (mod_id, d))