[tryton-debian-vcs] tryton-server branch debian-jessie-3.0 updated. debian/3.0.12-1-3-gadc6f84
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jan 17 20:31:12 UTC 2016
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.12-1-3-gadc6f84
commit adc6f84e5ea5628b909cf8ef21c524e257fe802a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jan 17 19:08:21 2016 +0100
Releasing debian version 3.0.13-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 2eaf5fa..3f8b34c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-server (3.0.13-1) unstable; urgency=medium
+
+ * Merging upstream version 3.0.13.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 17 Jan 2016 19:08:21 +0100
+
tryton-server (3.0.12-1) unstable; urgency=medium
* Merging upstream version 3.0.12.
commit 3812222dce7ae438576e232ee8e1301ae7f506e3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jan 17 19:08:20 2016 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 5cac357..b154dd9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright: 2004-2008 Tiny SPRL
- 2007-2015 Cédric Krier
+ 2007-2016 Cédric Krier
2007-2013 Bertrand Chenal
- 2008-2015 B2CK SPRL
+ 2008-2016 B2CK SPRL
2011 Openlabs Technologies & Consulting (P) Ltd
License: GPL-3+
commit 09e2b58b03cfa2be6f8c3d1fce75e97b59f0b1f8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jan 17 19:08:20 2016 +0100
Merging upstream version 3.0.13.
diff --git a/CHANGELOG b/CHANGELOG
index 4f8bd30..033b7fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.13 - 2016-01-11
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.12 - 2015-11-09
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 16cc09a..41201b2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2007-2015 Cédric Krier.
+Copyright (C) 2007-2016 Cédric Krier.
Copyright (C) 2007-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 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 397c7ff..31c59a4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 3.0.12
+Version: 3.0.13
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 397c7ff..31c59a4 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.12
+Version: 3.0.13
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond/model/fields/reference.py b/trytond/model/fields/reference.py
index 369650c..62c4bad 100644
--- a/trytond/model/fields/reference.py
+++ b/trytond/model/fields/reference.py
@@ -2,8 +2,6 @@
#this repository contains the full copyright notices and license terms.
import contextlib
from types import NoneType
-import warnings
-
from sql import Cast, Literal, Column, Query, Expression
from sql.functions import Substring, Position
@@ -34,12 +32,8 @@ class Reference(Field):
select=select, on_change=on_change, on_change_with=on_change_with,
depends=depends, context=context, loading=loading)
self.selection = selection or None
- self.selection_change_with = set()
- if selection_change_with:
- warnings.warn('selection_change_with argument is deprecated, '
- 'use the depends decorator',
- DeprecationWarning, stacklevel=2)
- self.selection_change_with |= set(selection_change_with)
+ self.selection_change_with = selection_change_with
+
__init__.__doc__ += Field.__init__.__doc__
def get(self, ids, model, name, values=None):
diff --git a/trytond/model/model.py b/trytond/model/model.py
index 5f43ae6..87fafeb 100644
--- a/trytond/model/model.py
+++ b/trytond/model/model.py
@@ -251,7 +251,7 @@ class Model(WarningErrorMixin, URLMixin, PoolBase):
res[field][arg] = copy.copy(getattr(cls._fields[field],
arg))
if (isinstance(cls._fields[field],
- (fields.Function, fields.One2Many))
+ (fields.Function, fields.One2Many, fields.Many2Many))
and not getattr(cls, 'order_%s' % field, None)):
res[field]['sortable'] = False
if ((isinstance(cls._fields[field], fields.Function)
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index 842fb7f..df57e20 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -331,12 +331,13 @@ class ModelView(Model):
# Remove field without read access
for field in fields_to_remove:
- for element in tree.xpath(
+ for i, element in enumerate(tree.xpath(
'//field[@name="%s"] | //label[@name="%s"]'
- % (field, field)):
+ % (field, field))):
if type == 'form':
element.tag = 'label'
element.attrib.clear()
+ element.attrib['id'] = 'hidden %s-%s' % (field, i)
elif type == 'tree':
parent = element.getparent()
parent.remove(element)
diff --git a/trytond/version.py b/trytond/version.py
index 21df2d7..b5ccd39 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.12"
+VERSION = "3.0.13"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-server
More information about the tryton-debian-vcs
mailing list