[tryton-debian-vcs] tryton-server branch upstream-2.2 updated. upstream/2.2.12-1-gfa9c535

[Mathias Behrle]

The following commit has been merged in the upstream-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/2.2.12-1-gfa9c535

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

    Adding upstream version 2.2.13.

diff --git a/CHANGELOG b/CHANGELOG
index 0fbe7e6..1d17e8d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.13 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.12 - 2013-12-04
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index b4f2380..a07cbbc 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-2011 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 6374928..fcd9281 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.2.12
+Version: 2.2.13
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index 6374928..fcd9281 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.2.12
+Version: 2.2.13
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/trytond/ir/trigger.py b/trytond/ir/trigger.py
index b2affe6..c7b0a8e 100644
--- a/trytond/ir/trigger.py
+++ b/trytond/ir/trigger.py
@@ -21,8 +21,8 @@ class Trigger(ModelSQL, ModelView):
     model = fields.Many2One('ir.model', 'Model', required=True, select=1)
     on_time = fields.Boolean('On Time', select=1, 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=1, states={
diff --git a/trytond/version.py b/trytond/version.py
index 6059f37..a91aa12 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 = "2.2.12"
+VERSION = "2.2.13"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
 
-- 
tryton-server