[tryton-debian-vcs] tryton-client branch debian-jessie-2.8 updated. debian/2.8.11-1-3-g7603e0a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 18 10:02:06 UTC 2015
The following commit has been merged in the debian-jessie-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/2.8.11-1-3-g7603e0a
commit 7603e0acf1fb0ad25ea172c88f7ad7c16d254c8f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 17 21:18:39 2015 +0100
Releasing debian version 2.8.12-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index af72c7f..e0a8725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-client (2.8.12-1) unstable; urgency=medium
+
+ * Merging upstream version 2.8.12.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 17 Feb 2015 21:18:39 +0100
+
tryton-client (2.8.11-1) unstable; urgency=medium
* Merging upstream version 2.8.11.
commit 4854368a97431540359b5bfc416bb3e436c25ad9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 17 21:18:38 2015 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 521bf8f..9cbef01 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2010-2014 Nicolas Évrard
- 2007-2014 Cédric Krier
+Copyright: 2010-2015 Nicolas Évrard
+ 2007-2015 Cédric Krier
2007-2013 Bertrand Chenal
- 2008-2014 B2CK SPRL
+ 2008-2015 B2CK SPRL
2008-2011 Udo Spallek
2008-2011 virtual things - Preisler & Spallek GbR
2011-2012 Rodrigo Hübner
commit b1685675027b37954734cd79beba4c6316cd71f5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 17 21:18:38 2015 +0100
Merging upstream version 2.8.12.
diff --git a/CHANGELOG b/CHANGELOG
index 062fe89..f0bdfd8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.12 - 2015-02-16
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.11 - 2014-11-06
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index e4acf21..244e72e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2010-2014 Nicolas Évrard.
-Copyright (C) 2007-2014 Cédric Krier.
+Copyright (C) 2010-2015 Nicolas Évrard.
+Copyright (C) 2007-2015 Cédric Krier.
Copyright (C) 2007-2013 Bertrand Chenal.
-Copyright (C) 2008-2014 B2CK SPRL.
+Copyright (C) 2008-2015 B2CK SPRL.
Copyright (C) 2008-2011 Udo Spallek.
Copyright (C) 2008-2011 virtual things - Preisler & Spallek GbR.
Copyright (C) 2011-2012 Rodrigo Hübner.
diff --git a/PKG-INFO b/PKG-INFO
index 16122d0..d11b707 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 2.8.11
+Version: 2.8.12
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/setup.py b/setup.py
index 96b5aac..3a78233 100644
--- a/setup.py
+++ b/setup.py
@@ -106,7 +106,8 @@ elif sys.platform == 'darwin':
'includes': ('pygtk, gtk, glib, cairo, pango, pangocairo, atk, '
'gobject, gio, gtk.keysyms'),
'resources': 'tryton/plugins',
- 'frameworks': 'librsvg-2.2.dylib',
+ 'frameworks':
+ 'librsvg-2.2.dylib, libjpeg.8.dylib, libtiff.3.dylib',
'plist': {
'CFBundleIdentifier': 'org.tryton',
'CFBundleName': 'Tryton',
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 16122d0..d11b707 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 2.8.11
+Version: 2.8.12
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/common/domain_parser.py b/tryton/common/domain_parser.py
index 9df03e1..4f286cf 100644
--- a/tryton/common/domain_parser.py
+++ b/tryton/common/domain_parser.py
@@ -12,7 +12,7 @@ import io
import collections
from tryton.translate import date_format
-from tryton.common import untimezoned_date, datetime_strftime
+from tryton.common import untimezoned_date, timezoned_date, datetime_strftime
from tryton.pyson import PYSONDecoder
__all__ = ['DomainParser']
@@ -417,7 +417,10 @@ def format_value(field, value):
if (not isinstance(value, datetime.datetime)
or value.time() == datetime.time.min):
format_ = date_format()
- return datetime_strftime(value, format_)
+ time = value
+ else:
+ time = timezoned_date(value)
+ return datetime_strftime(time, format_)
def format_date():
if not value:
@@ -538,7 +541,8 @@ def test_format_datetime():
for value, result in (
(datetime.date(2002, 12, 4), '12/04/2002'),
(datetime.datetime(2002, 12, 4), '12/04/2002'),
- (datetime.datetime(2002, 12, 4, 12, 30), '"12/04/2002 12:30:00"'),
+ (untimezoned_date(datetime.datetime(2002, 12, 4, 12, 30)),
+ '"12/04/2002 12:30:00"'),
(False, ''),
(None, ''),
):
@@ -592,7 +596,7 @@ def complete_value(field, value):
def complete_datetime():
yield datetime.date.today()
- yield datetime.datetime.now()
+ yield datetime.datetime.utcnow()
def complete_date():
yield datetime.date.today()
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 0cbecda..367dc5f 100644
--- a/tryton/gui/window/view_form/view/form_gtk/reference.py
+++ b/tryton/gui/window/view_form/view/form_gtk/reference.py
@@ -36,12 +36,6 @@ class Reference(Many2One, SelectionMixin, PopdownMixin):
res = child.get_text()
return self._selection.get(res, False)
- def get_empty_value(self):
- for name, model in self.widget_combo.get_model():
- if model in (None, ''):
- return model, name
- return '', ''
-
def _readonly_set(self, value):
super(Reference, self)._readonly_set(value)
if not value:
@@ -57,7 +51,7 @@ class Reference(Many2One, SelectionMixin, PopdownMixin):
try:
model, name = self.field.get_client(self.record)
except (ValueError, TypeError):
- model, name = self.get_empty_value()
+ model, name = '', ''
return (model != self.get_model()
or name != self.wid_text.get_text())
return False
@@ -110,7 +104,7 @@ class Reference(Many2One, SelectionMixin, PopdownMixin):
try:
model, name = field.get_client(record)
except (ValueError, TypeError):
- model, name = self.get_empty_value()
+ model, name = '', ''
if (model != self.get_model()
or name != self.wid_text.get_text()):
field.set_client(record, None)
diff --git a/tryton/gui/window/view_form/view/list_gtk/parser.py b/tryton/gui/window/view_form/view/list_gtk/parser.py
index f0e002b..bfad564 100644
--- a/tryton/gui/window/view_form/view/list_gtk/parser.py
+++ b/tryton/gui/window/view_form/view/list_gtk/parser.py
@@ -67,7 +67,7 @@ def sort_model(column, treeview, screen):
column.arrow.hide()
store = treeview.get_model()
unsaved_records = [x for x in store.group if x.id < 0]
- search_string = screen.screen_container.get_text() or None
+ search_string = screen.screen_container.get_text() or u''
if screen.search_count == len(store) or unsaved_records or screen.parent:
ids = screen.search_filter(search_string=search_string, only_ids=True)
store.sort(ids)
diff --git a/tryton/gui/window/win_import.py b/tryton/gui/window/win_import.py
index dfd4fed..95493e3 100644
--- a/tryton/gui/window/win_import.py
+++ b/tryton/gui/window/win_import.py
@@ -236,6 +236,9 @@ class WinImport(NoModal):
def on_row_expanded(self, treeview, iter, path):
child = self.model1.iter_children(iter)
+ # autodetect could call for node without children
+ if child is None:
+ return
if self.model1.get_value(child, 0) is None:
prefix_field = self.model1.get_value(iter, 1)
name, model = self.fields[prefix_field]
diff --git a/tryton/version.py b/tryton/version.py
index 4b2b7ca..c001058 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 = "2.8.11"
+VERSION = "2.8.12"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list