[tryton-debian-vcs] tryton-server branch upstream-2.8 updated. upstream/2.8.5-2-g68132a5

[Mathias Behrle]

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

commit 68132a5825093f75f4c8399dcfd040f984021c5a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 21:26:15 2014 +0100

    Adding upstream version 2.8.7.

diff --git a/CHANGELOG b/CHANGELOG
index 07d0306..98587d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.7 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.6 - 2014-03-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 07f5d7c..264b4eb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.8.6
+Version: 2.8.7
 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 07f5d7c..264b4eb 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.8.6
+Version: 2.8.7
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/ir/trigger.py b/trytond/ir/trigger.py
index 7ee4356..626e559 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 25d8b6c..c79f832 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.8.6"
+VERSION = "2.8.7"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
commit 621cc95872bba13e2e0be0023d6b5b21e0f63db2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 21:25:50 2014 +0100

    Adding upstream version 2.8.6.

diff --git a/CHANGELOG b/CHANGELOG
index d6e64c0..07d0306 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.6 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.5 - 2014-01-18
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 59d0304..56848fa 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-2013 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 b93c89d..07f5d7c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.8.5
+Version: 2.8.6
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/doc/topics/views/index.rst b/doc/topics/views/index.rst
index 1a2f765..9dfa0b9 100644
--- a/doc/topics/views/index.rst
+++ b/doc/topics/views/index.rst
@@ -290,14 +290,10 @@ Display a button.
 
     * ``string``: The string that will be displayed inside the button.
 
-    * ``name``: The name of the action:
+    * ``name``: The name of the function that will be called. The function must
+      have this syntax:
 
-        * ``object``: the name of the function that will called.  The function
-          must have this syntax:
-
-          ``button(self, ids)``
-
-        * ``action``: the id of the ir.action that will be called.
+        ``button(cls, records)``
 
     * ``icon``
 
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index b93c89d..07f5d7c 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.8.5
+Version: 2.8.6
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/version.py b/trytond/version.py
index c96e42f..25d8b6c 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.8.5"
+VERSION = "2.8.6"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server