[tryton-debian-vcs] tryton-server branch debian-stretch-3.8 updated. debian/3.8.5-1-3-g1fa7254

[Mathias Behrle]

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

commit 1fa7254ca1bac7fd227449479cc7b16956d24c11
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:20:10 2016 +0200

    Releasing debian version 3.8.6-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 39904c7..d23d478 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-server (3.8.6-1) unstable; urgency=medium
+
+  * Setting the branch in the watch file to the fixed version 3.8.
+  * Merging upstream version 3.8.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 11 Jul 2016 19:20:10 +0200
+
 tryton-server (3.8.5-1) unstable; urgency=medium
 
   * Merging upstream version 3.8.5.
commit 420d3586e5f61d9d3d1f3ec161943cad01f1da29
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:20:09 2016 +0200

    Merging upstream version 3.8.6.

diff --git a/CHANGELOG b/CHANGELOG
index d28a116..b0bb9d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.6 - 2016-07-04
+* Bug fixes (see mercurial logs for details)
+
 Version 3.8.5 - 2016-04-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index eaae680..f5d0318 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.8.5
+Version: 3.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 eda830c..509b51e 100644
--- a/doc/topics/views/index.rst
+++ b/doc/topics/views/index.rst
@@ -223,8 +223,6 @@ Display a field of the object with the value of the current record.
 
     * ``readonly``: Boolean to set the field readonly.
 
-    * ``required``: Boolean to set the field required.
-
     * ``mode``: Only for One2Many fields: it is a comma separated list, that
       specifies the order of the view used to display the relation. (Example:
       ``tree,form``)
@@ -510,8 +508,6 @@ field
 
     * ``readonly``: Boolean to set the field readonly.
 
-    * ``required``: Boolean to set the field required.
-
     * ``widget``: The widget that must be used instead of the default one.
 
     * ``tree_invisible``: Boolean to display or not the column.
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index eaae680..f5d0318 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.8.5
+Version: 3.8.6
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index 43b3472..b6eef79 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -4,7 +4,7 @@ import os
 import time
 from email import charset
 
-__version__ = "3.8.5"
+__version__ = "3.8.6"
 
 os.environ['TZ'] = 'UTC'
 if hasattr(time, 'tzset'):
diff --git a/trytond/ir/sequence.py b/trytond/ir/sequence.py
index f687760..b992878 100644
--- a/trytond/ir/sequence.py
+++ b/trytond/ir/sequence.py
@@ -158,6 +158,8 @@ class Sequence(ModelSQL, ModelView):
         return Transaction().context.get('code')
 
     def get_number_next(self, name):
+        if self.type != 'incremental':
+            return
         cursor = Transaction().cursor
         sql_name = self._sql_sequence_name
         if sql_sequence and not self._strict:
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index 4e709fb..541b258 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -429,8 +429,11 @@ class ModelView(Model):
                     parent.remove(element)
                 elif type == 'form':
                     element.tag = 'label'
+                    colspan = element.attrib.get('colspan')
                     element.attrib.clear()
                     element.attrib['id'] = 'hidden %s-%s' % (field, i)
+                    if colspan is not None:
+                        element.attrib['colspan'] = colspan
 
         if type == 'tree':
             ViewTreeWidth = pool.get('ir.ui.view_tree_width')
-- 
tryton-server