[tryton-debian-vcs] tryton-server branch debian-jessie-3.0 updated. debian/3.0.16-1-2-g6d48850

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/3.0.16-1-2-g6d48850

commit 6d4885022d8234d3758cd62f1bea0901c203e66d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:11:36 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 4baa164..470854d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (3.0.17-1) unstable; urgency=medium
+
+  * Merging upstream version 3.0.17.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 11 Jul 2016 19:11:35 +0200
+
 tryton-server (3.0.16-1) unstable; urgency=medium
 
   * Merging upstream version 3.0.16.
commit d3da8199b1021ce826ca6acbbc62ca18290d21e5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:11:35 2016 +0200

    Merging upstream version 3.0.17.

diff --git a/CHANGELOG b/CHANGELOG
index 5c237a1..1c49c24 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.17 - 2016-07-04
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.16 - 2016-04-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index fa93cfd..21c55e0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.0.16
+Version: 3.0.17
 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 bf9da74..98b2c7e 100644
--- a/doc/topics/views/index.rst
+++ b/doc/topics/views/index.rst
@@ -212,8 +212,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``)
@@ -479,8 +477,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 fa93cfd..21c55e0 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.0.16
+Version: 3.0.17
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index df57e20..9f5e3e2 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -336,8 +336,11 @@ class ModelView(Model):
                     % (field, field))):
                 if 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
                 elif type == 'tree':
                     parent = element.getparent()
                     parent.remove(element)
diff --git a/trytond/version.py b/trytond/version.py
index 3b78b06..2fbd807 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 = "3.0.16"
+VERSION = "3.0.17"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server