[tryton-debian-vcs] tryton-client branch debian-jessie-3.4 updated. debian/3.4.5-1-2-gb560102

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Fri Nov 13 19:31:15 UTC 2015


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

commit b560102a1797750eea9782f8abb7cced41808334
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Nov 13 19:00:03 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index dc9aed6..73dfa47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.4.6-1) unstable; urgency=medium
+
+  * Merging upstream version 3.4.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Fri, 13 Nov 2015 19:00:03 +0100
+
 tryton-client (3.4.5-1) unstable; urgency=medium
 
   * Merging upstream version 3.4.5.
commit db6868caed707b4248a8a936421b84ea93aa1bd1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Nov 13 19:00:02 2015 +0100

    Merging upstream version 3.4.6.

diff --git a/CHANGELOG b/CHANGELOG
index f302f48..9531d2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.6 - 2015-11-09
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.5 - 2015-09-08
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 25827be..30ca800 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.4.5
+Version: 3.4.6
 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 25827be..30ca800 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.4.5
+Version: 3.4.6
 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 10d3ddb..3aaf79d 100644
--- a/tryton/gui/window/view_board/view_board.py
+++ b/tryton/gui/window/view_board/view_board.py
@@ -189,8 +189,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/__init__.py b/tryton/gui/window/view_form/view/__init__.py
index ef1268c..525cc97 100644
--- a/tryton/gui/window/view_form/view/__init__.py
+++ b/tryton/gui/window/view_form/view/__init__.py
@@ -23,6 +23,10 @@ class View(object):
     def get_fields(self):
         raise NotImplementedError
 
+    @property
+    def selected_records(self):
+        return []
+
     def get_buttons(self):
         raise NotImplementedError
 
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 089c9f2..a8bb091 100644
--- a/tryton/gui/window/view_form/view/form_gtk/reference.py
+++ b/tryton/gui/window/view_form/view/form_gtk/reference.py
@@ -121,14 +121,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 76a4a05..be29d7f 100644
--- a/tryton/gui/window/view_form/view/graph_gtk/graph.py
+++ b/tryton/gui/window/view_form/view/graph_gtk/graph.py
@@ -356,8 +356,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 3b3f5fc..2aa78e3 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.4.5"
+VERSION = "3.4.6"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client



More information about the tryton-debian-vcs mailing list