[MERGE] forward port of branch saas-3 up to 3d80dc2

[odoo/odoo.git] / addons / calendar / __openerp__.py

diff --git a/addons/calendar/__openerp__.py b/addons/calendar/__openerp__.py
index 69ea590..a7e947b 100644 (file)
--- a/addons/calendar/__openerp__.py
+++ b/addons/calendar/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Calendar',
     'version': '1.0',
-    'depends': ['base', 'mail', 'base_action_rule','web_calendar'],
+    'depends': ['base', 'mail', 'base_action_rule', 'web_calendar'],
     'summary': 'Personal & Shared Calendar',
     'description': """
 This is a full-featured calendar system.
@@ -41,27 +41,20 @@ If you need to manage your meetings, you should install the CRM module.
     'demo': ['calendar_demo.xml'],
     'data': [
         'calendar_cron.xml',
-        'security/calendar_security.xml',
         'security/ir.model.access.csv',
+        'security/calendar_security.xml',
         'calendar_view.xml',
         'contacts_view.xml',
-        'calendar_data.xml',        
-    ],
-    'js': [
-        'static/src/js/*.js'
+        'calendar_data.xml',
+        'views/calendar.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
-    'css': [
-        'static/src/css/calendar.css'
+    'test': [
+        'test/calendar_test.yml',
+        'test/test_calendar_recurrent_event_case2.yml'
     ],
-    'test' : [
-              'test/calendar_test.yml',
-              'test/test_calendar_recurrent_event_case2.yml'
-              ],
     'installable': True,
     'application': True,
     'auto_install': False,
-    'images': ['images/calendar1.jpeg','images/calendar2.jpeg','images/calendar3.jpeg','images/calendar4.jpeg'],
+    'images': ['images/calendar1.jpeg', 'images/calendar2.jpeg', 'images/calendar3.jpeg', 'images/calendar4.jpeg'],
 }
-
-