diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html index ec33df12bec..83fbfcecefc 100644 --- a/addons/base/static/src/base.html +++ b/addons/base/static/src/base.html @@ -23,33 +23,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js index 3a5bd2a2915..504f5ca744d 100644 --- a/addons/base/static/src/js/base.js +++ b/addons/base/static/src/js/base.js @@ -126,9 +126,6 @@ openerp.base = function(instance) { openerp.base.search(instance); openerp.base.list(instance); openerp.base.form(instance); - openerp.base.calendar(instance); - openerp.base.gantt(instance); - openerp.base.diagram(instance); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index c4c55f2728d..6a46021edd4 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -491,7 +491,7 @@ openerp.base.Controller = openerp.base.BasicController.extend( /** @lends opener controller_manifest: { register: null, template: "", - element_post_prefix: false, + element_post_prefix: false }, /** * Controller registry, @@ -702,7 +702,7 @@ openerp.base.CrashManager = openerp.base.Controller.extend({ openerp.base.Loading = openerp.base.Controller.extend({ controller_manifest: { - register: ["Loading"], + register: ["Loading"] }, init: function(session, element_id) { this._super(session, element_id); diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 9f7ddc49a7b..cbb90ca9e2e 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -231,10 +231,6 @@ - -

-
-

@@ -574,48 +570,4 @@

- -

- - - - - -
-
-
-
-
- 		-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - -

- - - - - -
-
- 		-
-
- diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index e77da6a5629..3f4d8ee314d 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -1,57 +1,8 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - { - "name" : "Basic Calendar Functionality", - "version" : "1.0", - "depends" : ["base"], - 'description': """ -This is a full-featured calendar system. -======================================== - -It supports: - - Calendar of events - - Alerts (create requests) - - Recurring events - - Invitations to people""", - "author" : "OpenERP SA", - 'category': 'Tools', - 'website': 'http://www.openerp.com', - "init_xml" : [ - 'base_calendar_data.xml' - ], - "demo_xml" : [], - "update_xml" : [ - 'security/calendar_security.xml', - 'security/ir.model.access.csv', - 'wizard/calendar_event_edit_all_view.xml', - 'wizard/base_calendar_invite_attendee_view.xml', - 'wizard/base_calendar_set_exrule_view.xml', - 'base_calendar_view.xml' - ], - "test" : ['test/base_calendar_test.yml'], - "installable" : True, - "active" : False, - "certificate" : "00694071962960352821", - 'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',], + "name": "Hello", + "version": "2.0", + "depends": [], + "js": ["static/*/js/*.js"], + "css": [], + 'active': False } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_diagram/__openerp__.py b/addons/base_diagram/__openerp__.py index fb2a849f630..92b768896f9 100644 --- a/addons/base_diagram/__openerp__.py +++ b/addons/base_diagram/__openerp__.py @@ -2,5 +2,5 @@ "name" : "OpenERP Web base Diagram", "version" : "2.0", "depends" : [], - 'active': True, + 'active': False, } diff --git a/addons/base_gantt/__openerp__.py b/addons/base_gantt/__openerp__.py index d3b4dbd3885..afd1f402b59 100644 --- a/addons/base_gantt/__openerp__.py +++ b/addons/base_gantt/__openerp__.py @@ -4,4 +4,5 @@ "depends": [], "js": ["static/*/js/*.js"], "css": [], + 'active': False } diff --git a/addons/web_chat/__openerp__.py b/addons/web_chat/__openerp__.py index 132986ff90d..9c9ee6f3b2f 100644 --- a/addons/web_chat/__openerp__.py +++ b/addons/web_chat/__openerp__.py @@ -4,5 +4,5 @@ "depends": [], "js": ["static/src/web_chat.js"], "css": [], - 'active': True, + 'active': False, } diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index 8423dc878ab..027a86a8f78 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -436,10 +436,11 @@ class Root(object): manifest_path = os.path.join(path_addons, i, '__openerp__.py') if os.path.isfile(manifest_path): manifest = eval(open(manifest_path).read()) - print "Loading", i - m = __import__(i) - addons_module[i] = m - addons_manifest[i] = manifest + if manifest.get('active', True): + print "Loading", i + m = __import__(i) + addons_module[i] = m + addons_manifest[i] = manifest for k, v in controllers_class.items(): if k not in controllers_object: o = v()