diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py index 590d3b11a87..a5265ba694c 100644 --- a/openerp/addons/base/__openerp__.py +++ b/openerp/addons/base/__openerp__.py @@ -98,7 +98,6 @@ The kernel of OpenERP, needed for all installation. ], 'installable': True, 'auto_install': True, - 'certificate': '0076807797149', 'css': ['static/src/css/modules.css'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql index 441fe536a0a..c490df32294 100644 --- a/openerp/addons/base/base.sql +++ b/openerp/addons/base/base.sql @@ -294,7 +294,6 @@ CREATE TABLE ir_module_module ( shortdesc character varying(256), complexity character varying(32), category_id integer REFERENCES ir_module_category ON DELETE SET NULL, - certificate character varying(64), description text, application boolean default False, demo boolean default False, diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 617a31dae66..7621d5907ba 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -237,7 +237,6 @@ class module(osv.osv): '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), 'views_by_module': fields.function(_get_views, string='Views', type='text', multi="meta", store=True), - 'certificate' : fields.char('Quality Certificate', size=64, readonly=True), 'application': fields.boolean('Application', readonly=True), 'icon': fields.char('Icon URL', size=128), 'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"), @@ -253,12 +252,9 @@ class module(osv.osv): def _name_uniq_msg(self, cr, uid, ids, context=None): return _('The name of the module must be unique !') - def _certificate_uniq_msg(self, cr, uid, ids, context=None): - return _('The certificate ID of the module must be unique !') _sql_constraints = [ ('name_uniq', 'UNIQUE (name)',_name_uniq_msg ), - ('certificate_uniq', 'UNIQUE (certificate)',_certificate_uniq_msg ) ] def unlink(self, cr, uid, ids, context=None): @@ -511,7 +507,6 @@ class module(osv.osv): 'contributors': ', '.join(terp.get('contributors', [])) or False, 'website': terp.get('website', ''), 'license': terp.get('license', 'AGPL-3'), - 'certificate': terp.get('certificate') or False, 'sequence': terp.get('sequence', 100), 'application': terp.get('application', False), 'auto_install': terp.get('auto_install', False), @@ -677,14 +672,6 @@ class module(osv.osv): if not mod.description: _logger.warning('module %s: description is empty !', mod.name) - if not mod.certificate or not mod.certificate.isdigit(): - _logger.info('module %s: no quality certificate', mod.name) - else: - val = long(mod.certificate[2:]) % 97 == 29 - if not val: - _logger.critical('module %s: invalid quality certificate: %s', mod.name, mod.certificate) - raise osv.except_osv(_('Error'), _('Module %s: Invalid Quality Certificate') % (mod.name,)) - class module_dependency(osv.osv): _name = "ir.module.module.dependency" _description = "Module dependency" diff --git a/openerp/modules/db.py b/openerp/modules/db.py index 1bf7b5237f1..6318bd954f3 100644 --- a/openerp/modules/db.py +++ b/openerp/modules/db.py @@ -74,12 +74,12 @@ def initialize(cr): cr.execute('INSERT INTO ir_module_module \ (author, website, name, shortdesc, description, \ - category_id, auto_install, state, certificate, web, license, application, icon, sequence, summary) \ - VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', ( + category_id, auto_install, state, web, license, application, icon, sequence, summary) \ + VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', ( info['author'], info['website'], i, info['name'], info['description'], category_id, - info['auto_install'], state, info['certificate'], + info['auto_install'], state, info['web'], info['license'], info['application'], info['icon'], diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 86e69fa64ba..57fb92a6ee0 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -61,7 +61,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= :param graph: graph of module nodes to load :param status: status dictionary for keeping track of progress :param perform_checks: whether module descriptors should be checked for validity (prints warnings - for same cases, and even raise osv_except if certificate is invalid) + for same cases) :param skip_modules: optional list of module names (packages) which have previously been loaded and can be skipped :return: list of modules that were installed or updated """ diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 540a23c5bcd..6ec9e86340c 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -331,7 +331,6 @@ def load_information_from_description_file(module): 'author': '', 'auto_install': False, 'category': 'Uncategorized', - 'certificate': None, 'depends': [], 'description': '', 'icon': get_module_icon(module),