diff --git a/CHANGELOG b/CHANGELOG index 3c416a33c3..ea1ba0f3e6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +Version 1.2.0 - 2009-04-20 +* Bug fixes (see mercurial logs for details) * Add delete of foreign keys with ondelete CASCADE * Add write for foreign keys with ondelete SET NULL * Add datetime_field on Many2One to use a specific _datetime when reading the related record diff --git a/doc/conf.py b/doc/conf.py index 30e9645373..25894ba19e 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -86,7 +86,7 @@ html_style = 'default.css' # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -html_title = 'Tryton 1.1: Server Documentation' +html_title = 'Tryton 1.2: Server Documentation' # The name of an image file (within the static path) to place at the top of # the sidebar. diff --git a/trytond/version.py b/trytond/version.py index 205d12beda..71a83bd2f2 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.1.0" +VERSION = "1.2.0" LICENSE = "GPL-3" WEBSITE = "http://www.tryton.org/"