diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql index a93ea4eae5f..c0884895d67 100644 --- a/openerp/addons/base/base.sql +++ b/openerp/addons/base/base.sql @@ -295,7 +295,7 @@ CREATE TABLE ir_module_module ( category_id integer REFERENCES ir_module_category ON DELETE SET NULL, certificate character varying(64), description text, - is_application boolean default False, + application boolean default False, demo boolean default False, web boolean DEFAULT FALSE, license character varying(32), diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 68df983dc82..5db21282c65 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -215,7 +215,7 @@ class module(osv.osv): 'views_by_module': fields.function(_get_views, method=True, string='Views', type='text', multi="meta", store=True), 'certificate' : fields.char('Quality Certificate', size=64, readonly=True), 'web': fields.boolean('Has a web component', readonly=True), - 'is_application': fields.boolean('Is a Core Application', readonly=True), + 'application': fields.boolean('Application', readonly=True), 'icon': fields.char('Icon URL', size=128), 'complexity': fields.selection([('easy','Easy'), ('normal','Normal'), ('expert','Expert')], string='Complexity', readonly=True, diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index 2c9f384828b..d3fd31a3379 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -39,8 +39,8 @@ - - + + @@ -121,7 +121,7 @@ - + diff --git a/openerp/modules/db.py b/openerp/modules/db.py index c3118e4d267..31d6ddb60eb 100644 --- a/openerp/modules/db.py +++ b/openerp/modules/db.py @@ -75,14 +75,14 @@ def initialize(cr): cr.execute('INSERT INTO ir_module_module \ (author, website, name, shortdesc, description, \ - category_id, state, certificate, web, license, complexity, is_application, icon) \ + category_id, state, certificate, web, license, complexity, application, icon) \ VALUES (%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, state, info['certificate'], info['web'], info['license'], - info['complexity'], info['is_application'], info['icon'])) + info['complexity'], info['application'], info['icon'])) id = cr.fetchone()[0] cr.execute('INSERT INTO ir_model_data \ (name,model,module, res_id, noupdate) VALUES (%s,%s,%s,%s,%s)', ( diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 711d05a74b5..27929010308 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -250,7 +250,7 @@ def load_information_from_description_file(module): info.setdefault('name', False) info.setdefault('description', '') info.setdefault('complexity', 'normal') - info.setdefault('is_application', False) + info.setdefault('application', False) info.setdefault('icon', '') info['certificate'] = info.get('certificate') or None info['web'] = info.get('web') or False