[MERGE] from trunk

[odoo/odoo.git] / doc / conf.py

diff --git a/doc/conf.py b/doc/conf.py
index 54deb11..ac5b890 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -19,6 +19,7 @@ import sys, os
 #sys.path.insert(0, os.path.abspath('.'))
 sys.path.append(os.path.abspath('_themes'))
 sys.path.append(os.path.abspath('..'))
+sys.path.append(os.path.abspath('../openerp'))
 
 # -- General configuration -----------------------------------------------------
 
@@ -50,9 +51,9 @@ copyright = u'2012, OpenERP s.a.'
 # built documents.
 #
 # The short X.Y version.
-version = '6.1'
+version = '7.0'
 # The full version, including alpha/beta/rc tags.
-release = '6.1'
+release = '7.0b'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.