[tryton-debian-vcs] tryton-client branch upstream-2.2 updated. upstream/2.2.10-1-g735ca6b

[git repository hosting]

The following commit has been merged in the upstream-2.2 branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-client.git;a=commitdiff;h=upstream/2.2.10-1-g735ca6b

commit 735ca6b3aa8a510dcfad732d1e0defe535c6dd6d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 4 14:16:41 2013 +0100

    Adding upstream version 2.2.11.

diff --git a/CHANGELOG b/CHANGELOG
index 91c3772..f13ed51 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.2.11 - 2013-11-03
+* Bug fixes (see mercurial logs for details)
+* Sanitize report file extension
+
 Version 2.2.10 - 2013-10-10
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 15fa977..ce9cbba 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 2.2.10
+Version: 2.2.11
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 15fa977..ce9cbba 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.2.10
+Version: 2.2.11
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/tryton/action/main.py b/tryton/action/main.py
index 3c81170..d5df3e8 100644
--- a/tryton/action/main.py
+++ b/tryton/action/main.py
@@ -59,7 +59,8 @@ class Action(object):
         dtemp = tempfile.mkdtemp(prefix='tryton_')
         fp_name = os.path.join(dtemp,
                 name.replace(os.sep, '_').replace(os.altsep or os.sep, '_') \
-                        + os.extsep + type)
+            + os.extsep
+            + type.replace(os.sep, '_').replace(os.altsep or os.sep, '_'))
         with open(fp_name, 'wb') as file_d:
             file_d.write(data)
         if email_print:
diff --git a/tryton/gui/window/view_form/view/form_gtk/one2many.py b/tryton/gui/window/view_form/view/form_gtk/one2many.py
index 21ae30c..99eeebc 100644
--- a/tryton/gui/window/view_form/view/form_gtk/one2many.py
+++ b/tryton/gui/window/view_form/view/form_gtk/one2many.py
@@ -297,9 +297,8 @@ class One2Many(WidgetInterface):
         domain = self.field.domain_get(self.record)
         context = rpc.CONTEXT.copy()
         context.update(self.field.context_get(self.record))
-        domain = domain[:]
-        domain.extend(self.record.expr_eval(self.attrs.get('add_remove'),
-            context))
+        domain = [domain, self.record.expr_eval(self.attrs.get('add_remove'),
+                context)]
         removed_ids = self.field.get_removed_ids(self.record)
 
         try:
diff --git a/tryton/gui/window/view_form/view/list.py b/tryton/gui/window/view_form/view/list.py
index 1efca22..7c26376 100644
--- a/tryton/gui/window/view_form/view/list.py
+++ b/tryton/gui/window/view_form/view/list.py
@@ -129,7 +129,8 @@ class AdaptModelGroup(gtk.GenericTreeModel):
             # Don't remove record from previous group
             # as the new parent will change the parent
             # This prevents concurrency conflict
-            record.group.record_removed.remove(record)
+            if record in record.group.record_removed:
+                record.group.record_removed.remove(record)
             group.add(record)
             record.modified_fields.setdefault(record.parent_name or 'id')
         group.move(record, 0)
diff --git a/tryton/gui/window/win_export.py b/tryton/gui/window/win_export.py
index 43f2c96..107956e 100644
--- a/tryton/gui/window/win_export.py
+++ b/tryton/gui/window/win_export.py
@@ -370,7 +370,7 @@ class WinExport(object):
                             self.on_row_expanded(self.view1, iter,
                                     self.model1.get_path(iter))
                             iter = self.model1.iter_children(iter)
-                            prefix = parent + '/'
+                            prefix += parent + '/'
                             break
                         else:
                             iter = self.model1.iter_next(iter)
diff --git a/tryton/version.py b/tryton/version.py
index fdefcfd..ae1e1c5 100644
--- a/tryton/version.py
+++ b/tryton/version.py
@@ -1,7 +1,7 @@
 #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.2.10"
+VERSION = "2.2.11"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
 
-- 
tryton-client