From 69925d093fe1384af552e1ea1713812ad469cff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 1 Nov 2010 15:25:49 +0100
Subject: [PATCH] Prepare release 1.8.0

---
 CHANGELOG          | 2 ++
 doc/conf.py        | 4 ++--
 trytond/version.py | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7b7015bf40..86f28a2478 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
 * Add timestamp sequence
 * New transaction management
 * Make _timestamp numeric instead of datetime to work with XML-RPC and JSON-RPC
diff --git a/doc/conf.py b/doc/conf.py
index 2a10a23d87..762d79c753 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -47,9 +47,9 @@ copyright = u'2008-2010, Bertrand Chenal, Cédric Krier, Ian Wilson, Udo Spallek
 # built documents.
 #
 # The short X.Y version.
-version = '1.7'
+version = '1.8'
 # The full version, including alpha/beta/rc tags.
-release = '1.7'
+release = '1.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/trytond/version.py b/trytond/version.py
index 8f93143820..3fc540f2c5 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,7 +1,7 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "trytond"
-VERSION = "1.7.0"
+VERSION = "1.8.0"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"