[tryton-debian-vcs] tryton-server branch debian-wheezy-2.6 updated. debian/2.6.9-1-3-gfcd729d

[Mathias Behrle]

The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/2.6.9-1-3-gfcd729d

commit fcd729deb1903a3b8f421e987586b634a74cd752
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Mar 27 14:46:13 2014 +0100

    Releasing debian version 2.6.10-1.

diff --git a/debian/changelog b/debian/changelog
index bf74ad7..dfb3074 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-server (2.6.10-1) unstable; urgency=medium
+
+  * Merging upstream version 2.6.10.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 26 Mar 2014 21:59:46 +0100
+
 tryton-server (2.6.9-1) unstable; urgency=medium
 
   * Merging upstream version 2.6.9.
commit f239b2968a53c485c0621a467f14ff6fd3d361bf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 21:58:46 2014 +0100

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index 23b1ad3..43f284b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: 2004-2008 Tiny SPRL
-           2007-2013 Cédric Krier
+           2007-2014 Cédric Krier
            2007-2012 Bertrand Chenal
-           2008-2013 B2CK SPRL
+           2008-2014 B2CK SPRL
            2011 Openlabs Technologies & Consulting (P) Ltd
 License: GPL-3+
 
commit 5d21d33af3838a7471884ba240323027f50ce414
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 21:55:03 2014 +0100

    Merging upstream version 2.6.10.

diff --git a/CHANGELOG b/CHANGELOG
index 000053c..a2e8643 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.10 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.9 - 2014-01-18
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 21df598..35cf27a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2007-2013 Cédric Krier.
+Copyright (C) 2007-2014 Cédric Krier.
 Copyright (C) 2007-2012 Bertrand Chenal.
-Copyright (C) 2008-2013 B2CK SPRL.
+Copyright (C) 2008-2014 B2CK SPRL.
 Copyright (C) 2011 Openlabs Technologies & Consulting (P) Ltd.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 01adab7..694b358 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.9
+Version: 2.6.10
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index 01adab7..694b358 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.9
+Version: 2.6.10
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/ir/trigger.py b/trytond/ir/trigger.py
index 742bd9d..ca03c74 100644
--- a/trytond/ir/trigger.py
+++ b/trytond/ir/trigger.py
@@ -24,8 +24,8 @@ class Trigger(ModelSQL, ModelView):
     model = fields.Many2One('ir.model', 'Model', required=True, select=True)
     on_time = fields.Boolean('On Time', select=True, states={
             'invisible': (Eval('on_create', False)
-                or Eval('on_write', False)
-                or Eval('on_delete', False)),
+                | Eval('on_write', False)
+                | Eval('on_delete', False)),
         }, depends=['on_create', 'on_write', 'on_delete'],
         on_change=['on_time'])
     on_create = fields.Boolean('On Create', select=True, states={
diff --git a/trytond/version.py b/trytond/version.py
index 423f5b6..ad3283c 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
 #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 = "2.6.9"
+VERSION = "2.6.10"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server