[FIX] base_calendar: when searching on events, avoid getting an error if virtual_id...

[odoo/odoo.git] / openerp / release.py

diff --git a/openerp/release.py b/openerp/release.py
index ceb4d9d..50bcd0c 100644 (file)
--- a/openerp/release.py
+++ b/openerp/release.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
@@ -30,9 +30,9 @@ RELEASE_LEVELS_DISPLAY = {ALPHA: ALPHA,
 # properly comparable using normal operarors, for example:
 #  (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2)
 #  (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0)
-version_info = (6,1,0,BETA,0)
-version = '.'.join(map(str,version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '')
-major_version = '.'.join(map(str,version_info[:2]))
+version_info = (7, 0, 0, FINAL, 0)
+version = '.'.join(map(str, version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '')
+serie = major_version = '.'.join(map(str, version_info[:2]))
 
 description = 'OpenERP Server'
 long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic
@@ -50,4 +50,6 @@ author = 'OpenERP S.A.'
 author_email = 'info@openerp.com'
 license = 'AGPL-3'
 
+nt_service_name = "openerp-server-" + serie
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: