[tryton-debian-vcs] tryton-server branch debian-wheezy-2.2 updated. debian/2.2.12-1-4-g3d9472f

[Mathias Behrle]

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

commit 3d9472f63d2742b1f1d14779cbc5a621bf6cfedc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Mar 27 15:10:44 2014 +0100

    Releasing debian version 2.2.13-1.

diff --git a/debian/changelog b/debian/changelog
index c4475a3..51466f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-server (2.2.13-1) unstable; urgency=medium
+
+  * Merging upstream version 2.2.13.
+  * Removing inadvertently committed .pc directory.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 27 Mar 2014 15:05:41 +0100
+
 tryton-server (2.2.12-1) unstable; urgency=low
 
   * Merging upstream version 2.2.12.
commit 5fb40fdee2fa8645c63280503ef6187d149346b0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Mar 27 15:02:44 2014 +0100

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index 2b2ac89..92bf583 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-2011 Bertrand Chenal
-           2008-2013 B2CK SPRL
+           2008-2014 B2CK SPRL
            2011 Openlabs Technologies & Consulting (P) Ltd
 License: GPL-3+
 
commit 33d7061269ed3921bec4817721de5f48dc163149
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Mar 27 15:00:36 2014 +0100

    Removing inadvertently committed .pc directory.

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
commit c46bf3ce7267b76531b6af49dbdd2a45a49f9fc8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Mar 27 14:58:16 2014 +0100

    Merging 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