[tryton-debian-vcs] tryton-server branch upstream-3.6 updated. upstream/3.6.9-1-gff111d6

[Mathias Behrle]

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

commit ff111d6e24680842facdcff953c91dc9d01b1fe2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:16:55 2016 +0200

    Adding upstream version 3.6.10.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index c3deb3b..7a5c4c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.10 - 2016-07-04
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.9 - 2016-04-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 12a0674..8f62afc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.6.9
+Version: 3.6.10
 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 479670c..9b71470 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``)
@@ -513,8 +511,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 12a0674..8f62afc 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.6.9
+Version: 3.6.10
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index 590a3aa..242b764 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -4,7 +4,7 @@ import os
 import time
 from email import charset
 
-__version__ = "3.6.9"
+__version__ = "3.6.10"
 
 os.environ['TZ'] = 'UTC'
 if hasattr(time, 'tzset'):
diff --git a/trytond/ir/sequence.py b/trytond/ir/sequence.py
index 33d0c18..ab2edaa 100644
--- a/trytond/ir/sequence.py
+++ b/trytond/ir/sequence.py
@@ -156,6 +156,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 cf84941..e859922 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -438,8 +438,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