[tryton-debian-vcs] tryton-client branch debian-jessie-3.2 updated. debian/3.2.10-1-2-ge585579
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 13 19:31:14 UTC 2015
The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.2.10-1-2-ge585579
commit e5855791e947f15091c1046ec54f609f84e524b1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Nov 13 18:58:28 2015 +0100
Releasing debian version 3.2.11-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index dd66f99..b8acb8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.2.11-1) unstable; urgency=medium
+
+ * Merging upstream version 3.2.11.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 13 Nov 2015 18:58:28 +0100
+
tryton-client (3.2.10-1) unstable; urgency=medium
* Merging upstream version 3.2.10.
commit 257f9908be80bd5b7a184ac4ff7f5f6a70657a68
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Nov 13 18:58:28 2015 +0100
Merging upstream version 3.2.11.
diff --git a/CHANGELOG b/CHANGELOG
index 2790197..19d054f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.11 - 2015-11-09
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.10 - 2015-09-08
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index bb965df..95c145b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.2.10
+Version: 3.2.11
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index bb965df..95c145b 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.2.10
+Version: 3.2.11
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/gui/window/view_board/view_board.py b/tryton/gui/window/view_board/view_board.py
index 688e0cf..f9ee7b9 100644
--- a/tryton/gui/window/view_board/view_board.py
+++ b/tryton/gui/window/view_board/view_board.py
@@ -31,8 +31,8 @@ class ViewBoard(object):
return self.widget
def reload(self):
- for widget in self.widgets:
- widget.display()
+ for action in self.actions:
+ action.display()
def _active_changed(self, event_action, *args):
for action in self.actions:
diff --git a/tryton/gui/window/view_form/view/form_gtk/reference.py b/tryton/gui/window/view_form/view/form_gtk/reference.py
index 0455e23..2e973a6 100644
--- a/tryton/gui/window/view_form/view/form_gtk/reference.py
+++ b/tryton/gui/window/view_form/view/form_gtk/reference.py
@@ -124,14 +124,14 @@ class Reference(Many2One, SelectionMixin, PopdownMixin):
else:
model, value = None, None
super(Reference, self).set_text(value)
-
- active = -1
- combo_model = self.widget_combo.get_model()
- for i, selection in enumerate(combo_model):
- if selection[1] == model:
- active = i
- break
- self.widget_combo.set_active(active)
+ child = self.widget_combo.get_child()
+ child.handler_block_by_func(self.sig_changed_combo)
+ if not self.set_popdown_value(self.widget_combo, model):
+ text = self.get_inactive_selection(model)
+ self.set_popdown(
+ self.selection[:] + [(model, text)], self.widget_combo)
+ self.set_popdown_value(self.widget_combo, value)
+ child.handler_unblock_by_func(self.sig_changed_combo)
def display(self, record, field):
self.update_selection(record, field)
diff --git a/tryton/gui/window/view_form/view/graph_gtk/graph.py b/tryton/gui/window/view_form/view/graph_gtk/graph.py
index 8038ff5..f26ce11 100644
--- a/tryton/gui/window/view_form/view/graph_gtk/graph.py
+++ b/tryton/gui/window/view_form/view/graph_gtk/graph.py
@@ -349,8 +349,18 @@ class Graph(gtk.DrawingArea):
minx = x
if not maxx:
maxx = x
- minx = min(minx, x)
- maxx = max(maxx, x)
+ if minx is None and maxx is None:
+ if isinstance(x, datetime.datetime):
+ minx, maxx = datetime.datetime.min, datetime.datetime.max
+ elif isinstance(x, datetime.date):
+ minx, maxx = datetime.date.min, datetime.date.max
+ elif isinstance(x, datetime.timedelta):
+ minx, maxx = datetime.timedelta.min, datetime.timedelta.max
+ try:
+ minx = min(minx, x)
+ maxx = max(maxx, x)
+ except TypeError:
+ continue
self.labels[x] = model[self.xfield['name']].get_client(model)
self.ids.setdefault(x, [])
self.ids[x].append(model.id)
diff --git a/tryton/version.py b/tryton/version.py
index 8d1536b..64e126c 100644
--- a/tryton/version.py
+++ b/tryton/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 = "tryton"
-VERSION = "3.2.10"
+VERSION = "3.2.11"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list