[tryton-debian-vcs] tryton-client branch debian-stretch-3.6 updated. debian/3.6.3-1-3-g5043910
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-stretch-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.6.3-1-3-g5043910
commit 50439106271aadaee4dbb2ec233353d11bbc4029
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Nov 13 19:02:06 2015 +0100
Releasing debian version 3.6.4-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 0d96757..4c91584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-client (3.6.4-1) unstable; urgency=medium
+
+ * Setting the branch in the watch file to the fixed version 3.6.
+ * Merging upstream version 3.6.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 13 Nov 2015 19:02:06 +0100
+
tryton-client (3.6.3-1) unstable; urgency=medium
* Merging upstream version 3.6.3.
commit 45722235381152f8aa855b3d439c77d3543a1686
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Nov 13 19:02:05 2015 +0100
Merging upstream version 3.6.4.
diff --git a/CHANGELOG b/CHANGELOG
index a64a66d..e816f9c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.4 - 2015-11-09
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.3 - 2015-09-08
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 926ed32..782a6f7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.6.3
+Version: 3.6.4
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/share/locale/ca_ES/LC_MESSAGES/tryton.mo b/share/locale/ca_ES/LC_MESSAGES/tryton.mo
index 08f9221..a092bdb 100644
Binary files a/share/locale/ca_ES/LC_MESSAGES/tryton.mo and b/share/locale/ca_ES/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/ca_ES/LC_MESSAGES/tryton.po b/share/locale/ca_ES/LC_MESSAGES/tryton.po
index 7e7120d..581284b 100644
--- a/share/locale/ca_ES/LC_MESSAGES/tryton.po
+++ b/share/locale/ca_ES/LC_MESSAGES/tryton.po
@@ -256,7 +256,7 @@ msgid "M"
msgstr "M"
msgid "w"
-msgstr "s"
+msgstr "S"
msgid "d"
msgstr "d"
diff --git a/share/locale/es_AR/LC_MESSAGES/tryton.mo b/share/locale/es_AR/LC_MESSAGES/tryton.mo
index a6e1458..193a8fc 100644
Binary files a/share/locale/es_AR/LC_MESSAGES/tryton.mo and b/share/locale/es_AR/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/es_AR/LC_MESSAGES/tryton.po b/share/locale/es_AR/LC_MESSAGES/tryton.po
index f85cd30..4246629 100644
--- a/share/locale/es_AR/LC_MESSAGES/tryton.po
+++ b/share/locale/es_AR/LC_MESSAGES/tryton.po
@@ -254,7 +254,7 @@ msgid "M"
msgstr "M"
msgid "w"
-msgstr "s"
+msgstr "S"
msgid "d"
msgstr "d"
diff --git a/share/locale/es_CO/LC_MESSAGES/tryton.mo b/share/locale/es_CO/LC_MESSAGES/tryton.mo
index e033a54..cdf1db9 100644
Binary files a/share/locale/es_CO/LC_MESSAGES/tryton.mo and b/share/locale/es_CO/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/es_CO/LC_MESSAGES/tryton.po b/share/locale/es_CO/LC_MESSAGES/tryton.po
index d0d4a7e..9535ac2 100644
--- a/share/locale/es_CO/LC_MESSAGES/tryton.po
+++ b/share/locale/es_CO/LC_MESSAGES/tryton.po
@@ -255,7 +255,7 @@ msgid "M"
msgstr "M"
msgid "w"
-msgstr "s"
+msgstr "S"
msgid "d"
msgstr "d"
diff --git a/share/locale/es_EC/LC_MESSAGES/tryton.mo b/share/locale/es_EC/LC_MESSAGES/tryton.mo
index f35af54..60f0f06 100644
Binary files a/share/locale/es_EC/LC_MESSAGES/tryton.mo and b/share/locale/es_EC/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/es_EC/LC_MESSAGES/tryton.po b/share/locale/es_EC/LC_MESSAGES/tryton.po
index b9dd166..aab84bc 100644
--- a/share/locale/es_EC/LC_MESSAGES/tryton.po
+++ b/share/locale/es_EC/LC_MESSAGES/tryton.po
@@ -255,7 +255,7 @@ msgid "M"
msgstr "M"
msgid "w"
-msgstr "s"
+msgstr "S"
msgid "d"
msgstr "d"
diff --git a/share/locale/es_ES/LC_MESSAGES/tryton.mo b/share/locale/es_ES/LC_MESSAGES/tryton.mo
index 2ee9c80..ff7f235 100644
Binary files a/share/locale/es_ES/LC_MESSAGES/tryton.mo and b/share/locale/es_ES/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/es_ES/LC_MESSAGES/tryton.po b/share/locale/es_ES/LC_MESSAGES/tryton.po
index ac79870..8620ece 100644
--- a/share/locale/es_ES/LC_MESSAGES/tryton.po
+++ b/share/locale/es_ES/LC_MESSAGES/tryton.po
@@ -259,7 +259,7 @@ msgid "M"
msgstr "M"
msgid "w"
-msgstr "s"
+msgstr "S"
msgid "d"
msgstr "d"
diff --git a/share/locale/fr_FR/LC_MESSAGES/tryton.mo b/share/locale/fr_FR/LC_MESSAGES/tryton.mo
index b837302..e3bfb22 100644
Binary files a/share/locale/fr_FR/LC_MESSAGES/tryton.mo and b/share/locale/fr_FR/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/fr_FR/LC_MESSAGES/tryton.po b/share/locale/fr_FR/LC_MESSAGES/tryton.po
index 0cd179c..7559675 100644
--- a/share/locale/fr_FR/LC_MESSAGES/tryton.po
+++ b/share/locale/fr_FR/LC_MESSAGES/tryton.po
@@ -254,7 +254,7 @@ msgid "M"
msgstr "M"
msgid "w"
-msgstr "s"
+msgstr "S"
msgid "d"
msgstr "j"
diff --git a/share/locale/nl_NL/LC_MESSAGES/tryton.mo b/share/locale/nl_NL/LC_MESSAGES/tryton.mo
index 712b918..a3e93f1 100644
Binary files a/share/locale/nl_NL/LC_MESSAGES/tryton.mo and b/share/locale/nl_NL/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/nl_NL/LC_MESSAGES/tryton.po b/share/locale/nl_NL/LC_MESSAGES/tryton.po
index 7db2d94..ca9c54d 100644
--- a/share/locale/nl_NL/LC_MESSAGES/tryton.po
+++ b/share/locale/nl_NL/LC_MESSAGES/tryton.po
@@ -257,7 +257,7 @@ msgid "Print..."
msgstr "Afdrukken"
msgid "Y"
-msgstr " J"
+msgstr "J"
msgid "M"
msgstr "M"
@@ -266,7 +266,7 @@ msgid "w"
msgstr "w"
msgid "d"
-msgstr " d"
+msgstr "d"
msgid "h"
msgstr "u"
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 926ed32..782a6f7 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.6.3
+Version: 3.6.4
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 4fd62c1..7a6cd41 100644
--- a/tryton/__init__.py
+++ b/tryton/__init__.py
@@ -1,3 +1,3 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-__version__ = "3.6.3"
+__version__ = "3.6.4"
diff --git a/tryton/common/datetime_.py b/tryton/common/datetime_.py
index 1b8de7a..7dc25d0 100644
--- a/tryton/common/datetime_.py
+++ b/tryton/common/datetime_.py
@@ -275,7 +275,7 @@ class Time(gtk.ComboBoxEntry):
self.__time = time
def update_label(self):
- if not self.__time:
+ if self.__time is None:
self.__entry.set_text('')
return
diff --git a/tryton/common/domain_inversion.py b/tryton/common/domain_inversion.py
index ae67e5a..7320271 100644
--- a/tryton/common/domain_inversion.py
+++ b/tryton/common/domain_inversion.py
@@ -141,7 +141,7 @@ def eval_domain(domain, context, boolop=operator.and_):
eval_domain(domain[1:], context, boolop))
-def localize_domain(domain, field_name=None):
+def localize_domain(domain, field_name=None, strip_target=False):
"returns only locale part of domain. eg: langage.code -> code"
if domain in ('AND', 'OR', True, False):
return domain
@@ -154,10 +154,12 @@ def localize_domain(domain, field_name=None):
locale_name = 'id'
if isinstance(domain[2], basestring):
locale_name = 'rec_name'
+ n = 3 if strip_target else 4
return [locale_part(domain[0], field_name, locale_name)] \
- + list(domain[1:3]) + list(domain[4:])
+ + list(domain[1:n]) + list(domain[4:])
else:
- return [localize_domain(part, field_name) for part in domain]
+ return [localize_domain(part, field_name, strip_target)
+ for part in domain]
def simplify(domain):
@@ -608,10 +610,12 @@ def test_localize():
assert localize_domain(domain, 'x') == [['y', 'child_of', [1]]]
domain = [['x.id', '=', 1, 'y']]
- assert localize_domain(domain, 'x') == [['id', '=', 1]]
+ assert localize_domain(domain, 'x', False) == [['id', '=', 1, 'y']]
+ assert localize_domain(domain, 'x', True) == [['id', '=', 1]]
domain = [['a.b.c', '=', 1, 'y', 'z']]
- assert localize_domain(domain, 'x') == [['b.c', '=', 1, 'z']]
+ assert localize_domain(domain, 'x', False) == [['b.c', '=', 1, 'y', 'z']]
+ assert localize_domain(domain, 'x', True) == [['b.c', '=', 1, 'z']]
if __name__ == '__main__':
test_simple_inversion()
diff --git a/tryton/gui/window/view_board/view_board.py b/tryton/gui/window/view_board/view_board.py
index 54af38a..aa0505b 100644
--- a/tryton/gui/window/view_board/view_board.py
+++ b/tryton/gui/window/view_board/view_board.py
@@ -162,8 +162,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/model/field.py b/tryton/gui/window/view_form/model/field.py
index 45f2be1..1c70c04 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -846,7 +846,8 @@ class ReferenceField(Field):
model = None
screen_domain, attr_domain = self.domains_get(record)
return concat(localize_domain(
- filter_leaf(screen_domain, self.name, model)), attr_domain)
+ filter_leaf(screen_domain, self.name, model),
+ strip_target=True), attr_domain)
class _FileCache(object):
diff --git a/tryton/gui/window/view_form/view/__init__.py b/tryton/gui/window/view_form/view/__init__.py
index 14c6d24..cbca0ab 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 d997f8b..15ce0da 100644
--- a/tryton/gui/window/view_form/view/form_gtk/reference.py
+++ b/tryton/gui/window/view_form/view/form_gtk/reference.py
@@ -121,17 +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)
- if active == -1:
- # When setting no item GTK doesn't clear the entry
- self.widget_combo.child.set_text('')
+ 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 642a55e..67d7c10 100644
--- a/tryton/gui/window/view_form/view/graph_gtk/graph.py
+++ b/tryton/gui/window/view_form/view/graph_gtk/graph.py
@@ -355,8 +355,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/gui/window/view_form/view/list.py b/tryton/gui/window/view_form/view/list.py
index ffcc948..3d2aca0 100644
--- a/tryton/gui/window/view_form/view/list.py
+++ b/tryton/gui/window/view_form/view/list.py
@@ -1114,7 +1114,7 @@ class ViewTree(View):
if not isinstance(inv_domain, bool):
inv_domain = simplify(inv_domain)
unique, _, _ = unique_value(inv_domain)
- column.set_visible(not unique)
+ column.set_visible(not unique or bool(self.children_field))
def set_state(self):
record = self.screen.current_record
--
tryton-client
More information about the tryton-debian-vcs
mailing list