[tryton-debian-vcs] tryton-client branch upstream-2.6 updated. upstream/2.6.11-1-g06ab6f3

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=upstream/2.6.11-1-g06ab6f3

commit 06ab6f3d857f85b5c2e518407d84bb5da2a51936
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Aug 26 13:55:15 2014 +0200

    Adding upstream version 2.6.12.

diff --git a/CHANGELOG b/CHANGELOG
index 1552748..822a872 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.12 - 2014-08-03
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.11 - 2014-07-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index ac3ded5..4aa65e6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 2.6.11
+Version: 2.6.12
 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 ac3ded5..4aa65e6 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.6.11
+Version: 2.6.12
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/tryton/common/domain_inversion.py b/tryton/common/domain_inversion.py
index 03b1f30..3da2b04 100644
--- a/tryton/common/domain_inversion.py
+++ b/tryton/common/domain_inversion.py
@@ -146,6 +146,8 @@ def simplify(domain):
         return domain
     elif domain in ('OR', 'AND'):
         return domain
+    elif domain in (['OR'], ['AND']):
+        return []
     elif (isinstance(domain, list) and len(domain) == 1
         and not is_leaf(domain[0])):
         return simplify(domain[0])
@@ -413,6 +415,10 @@ def test_simplify():
     assert simplify(domain) == ['OR', [['x', '=', 3]], [['y', '=', 5]]]
     domain = ['OR', ['x', '=', 3], ['AND', ['y', '=', 5]]]
     assert simplify(domain) == ['OR', ['x', '=', 3], [['y', '=', 5]]]
+    domain = ['AND']
+    assert simplify(domain) == []
+    domain = ['OR']
+    assert simplify(domain) == []
 
 
 def test_merge():
diff --git a/tryton/gui/window/view_form/view/list.py b/tryton/gui/window/view_form/view/list.py
index 9205e8f..f0e759b 100644
--- a/tryton/gui/window/view_form/view/list.py
+++ b/tryton/gui/window/view_form/view/list.py
@@ -432,7 +432,9 @@ class ViewList(ParserView):
             if not col.get_visible() or not col.name:
                 continue
             cell = self.widget_tree.cells[col.name]
-            values.append('"' + str(cell.get_textual_value(record)) + '"')
+            values.append('"'
+                + str(cell.get_textual_value(record)).replace('"', '""')
+                + '"')
         data.append('\t'.join(values))
         return
 
diff --git a/tryton/version.py b/tryton/version.py
index 39f36a7..ab4a797 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.6.11"
+VERSION = "2.6.12"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client