[tryton-debian-vcs] tryton-server branch upstream-3.4 updated. upstream/3.4.12-1-g6c7724f

[Mathias Behrle]

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

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

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

diff --git a/CHANGELOG b/CHANGELOG
index 8c1d4f8..56e4788 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.13 - 2016-07-04
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.12 - 2016-04-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 25cd711..a2bd8d1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.4.12
+Version: 3.4.13
 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 0f79504..ef5be42 100644
--- a/doc/topics/views/index.rst
+++ b/doc/topics/views/index.rst
@@ -215,8 +215,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``)
@@ -504,8 +502,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 25cd711..a2bd8d1 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.4.12
+Version: 3.4.13
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index 344929a..a7e28b2 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -312,8 +312,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 5ba7b12..98f96ac 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.4.12"
+VERSION = "3.4.13"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server