[MERGE] merge with latest stable

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

diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
old mode 100755 (executable)
new mode 100644 (file)
index 41872ca..3c24403
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -19,27 +19,25 @@
 #
 ##############################################################################
 
-
 {
     "name" : "Resource",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Generic Modules/Projects & Services",
     "website" : "http://www.openerp.com",
     "description": """
     Module for resource management
      A resource represent something that can be scheduled
-     (a developer on a task or a workcenter on manufacturing orders).
+     (a developer on a task or a work center on manufacturing orders).
      This module manages a resource calendar associated to every resource.
      It also manages the leaves of every resource.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'process'],
+    'depends': ['process'],
     'init_xml': [],
     'update_xml': [
-        #'security/resource_security.xml',
         'security/ir.model.access.csv',
         'resource_view.xml',
     ],
@@ -47,6 +45,7 @@
     ],
     'installable': True,
     'active': False,
-    'certificate': None,
+    'certificate': '00746371192190459469',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: