[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20110830065735-uyvn8bgu32cfobto

diff --cc addons/base_calendar/__openerp__.py
index a01cf0d,b8f6a95..4281ec0
--- 1/addons/base_calendar/__openerp__.py
--- 2/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@@ -1,55 -1,14 +1,56 @@@
 +# -*- coding: utf-8 -*-
 +##############################################################################
 +#
 +#    OpenERP, Open Source Management Solution
 +#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 +#
 +#    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 <http://www.gnu.org/licenses/>.
 +#
 +##############################################################################
 +
  {
 -    "name": "Base calendar",
 -    "version": "2.0",
 -    "depends": ['base'],
 -    "js": [
 -        'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js',
 -        'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js',
 -        'static/src/js/calendar.js'
 +    "name" : "Basic Calendar Functionality",
 +    "version" : "1.0",
 +    "depends" : ["base"],
++    'complexity': "easy",
 +    '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'
      ],
 -    "css": ['static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css',
 -            'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_ext.css'
 -            ],
 -    'active': True
 +    "demo_xml" : [],
 +    "update_xml" : [
 +        'security/calendar_security.xml',
 +        'security/ir.model.access.csv',
 +        'wizard/base_calendar_invite_attendee_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',],
  }
 +
 +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: