[tryton-debian-vcs] tryton-client branch debian-jessie-3.2 updated. debian/3.2.9-1-2-g3bc3a9d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Mon Sep 21 12:24:41 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.9-1-2-g3bc3a9d
commit 3bc3a9d14ff908366ca5674aecdb2774bba97eb7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Sep 20 19:50:49 2015 +0200
Releasing debian version 3.2.10-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index c91f272..dd66f99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.2.10-1) unstable; urgency=medium
+
+ * Merging upstream version 3.2.10.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 20 Sep 2015 19:50:49 +0200
+
tryton-client (3.2.9-1) unstable; urgency=medium
* Merging upstream version 3.2.9.
commit df8cc15411964bfb924edb8279a7641768ea558e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Sep 20 19:50:49 2015 +0200
Merging upstream version 3.2.10.
diff --git a/CHANGELOG b/CHANGELOG
index 5bef017..2790197 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.10 - 2015-09-08
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.9 - 2015-05-19
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 4b4018b..bb965df 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.2.9
+Version: 3.2.10
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/doc/usage.rst b/doc/usage.rst
index 16f0120..a73d0eb 100644
--- a/doc/usage.rst
+++ b/doc/usage.rst
@@ -49,6 +49,11 @@ Options
-s SERVER, --server=SERVER Specify the server hostname
+Environment
+***********
+
+`GTKOSXAPPLICATION` Activate with native Mac desktop
+
URL
***
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 4b4018b..bb965df 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.9
+Version: 3.2.10
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/common/common.py b/tryton/common/common.py
index efc39ae..37b9ac7 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -465,8 +465,8 @@ def file_selection(title, filename='',
filename = win.get_preview_filename()
if filename:
try:
- pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(filename.decode(
- sys.getfilesystemencoding().encode('utf-8')), 128, 128)
+ pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+ filename, 128, 128)
img.set_from_pixbuf(pixbuf)
have_preview = True
except (IOError, glib.GError):
diff --git a/tryton/config.py b/tryton/config.py
index f6a6d58..39825c8 100644
--- a/tryton/config.py
+++ b/tryton/config.py
@@ -18,7 +18,8 @@ _ = gettext.gettext
def get_home_dir():
if os.name == 'nt':
- return os.path.join(os.environ['HOMEDRIVE'], os.environ['HOMEPATH'])
+ return os.path.join(os.environ['HOMEDRIVE'], os.environ['HOMEPATH']
+ ).decode(sys.getfilesystemencoding()).encode('utf-8')
return os.environ['HOME']
diff --git a/tryton/gui/main.py b/tryton/gui/main.py
index c7c3d42..899bce2 100644
--- a/tryton/gui/main.py
+++ b/tryton/gui/main.py
@@ -42,9 +42,9 @@ import tryton.plugins
from tryton.common.placeholder_entry import PlaceholderEntry
import pango
import time
-try:
+if os.environ.get('GTKOSXAPPLICATION'):
import gtk_osxapplication
-except ImportError:
+else:
gtk_osxapplication = None
try:
import gtkspell
diff --git a/tryton/gui/window/view_form/model/record.py b/tryton/gui/window/view_form/model/record.py
index 3241c0c..4e459e9 100644
--- a/tryton/gui/window/view_form/model/record.py
+++ b/tryton/gui/window/view_form/model/record.py
@@ -283,7 +283,8 @@ class Record(SignalEvent):
def get_timestamp(self):
result = {self.model_name + ',' + str(self.id): self._timestamp}
for name, field in self.group.fields.iteritems():
- result.update(field.get_timestamp(self))
+ if name in self._loaded:
+ result.update(field.get_timestamp(self))
return result
def pre_validate(self):
diff --git a/tryton/gui/window/view_form/view/list.py b/tryton/gui/window/view_form/view/list.py
index 9aff350..fb4603e 100644
--- a/tryton/gui/window/view_form/view/list.py
+++ b/tryton/gui/window/view_form/view/list.py
@@ -203,7 +203,7 @@ class AdaptModelGroup(gtk.GenericTreeModel):
return False
children = record.children_group(self.children_field)
if children is None:
- return True
+ return False
length = len(children)
if self.__removed and self.__removed in children:
length -= 1
@@ -211,7 +211,10 @@ class AdaptModelGroup(gtk.GenericTreeModel):
def on_iter_children(self, record):
if record is None:
- return None
+ if self.group:
+ return self.group[0]
+ else:
+ return None
if self.children_field:
children = record.children_group(self.children_field)
if children:
@@ -219,15 +222,19 @@ class AdaptModelGroup(gtk.GenericTreeModel):
return None
def on_iter_n_children(self, record):
- if record is None or not self.children_field:
+ if record is None:
return len(self.group)
+ if not self.children_field:
+ return 0
return len(record.children_group(self.children_field))
def on_iter_nth_child(self, record, nth):
- if record is None or not self.children_field:
+ if record is None:
if nth < len(self.group):
return self.group[nth]
return None
+ if not self.children_field:
+ return None
if nth < len(record.children_group(self.children_field)):
return record.children_group(self.children_field)[nth]
return None
diff --git a/tryton/version.py b/tryton/version.py
index 1b98d04..8d1536b 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.9"
+VERSION = "3.2.10"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list