[MERGE] merge with latest stable

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

diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 3a18406..8a2a667 100644 (file)
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -22,7 +22,7 @@
 
 {
     'name': 'Integrated Document Management System',
-    'version': '1.99',
+    'version': '2.1',
     'category': 'Generic Modules/Others',
     'description': """This is a complete document management system:
     * User Authentication
@@ -46,7 +46,7 @@
         'security/document_security.xml',
         'document_view.xml',
         'document_data.xml',
-#        'wizard/document_configuration_view.xml',
+        'wizard/document_configuration_view.xml',
         'security/ir.model.access.csv',
         'report/document_report_view.xml',
         'board_document_view.xml',
@@ -57,7 +57,7 @@
     ],
     'installable': True,
     'active': False,
-    'certificate': None,
+    'certificate': '0070515416461',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: