[tryton-debian-vcs] tryton-client branch debian-jessie-3.2 updated. debian/3.2.7-1-2-ga4f5107

[Mathias Behrle]

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.7-1-2-ga4f5107

commit a4f51076a056945236d97cb6687d9d5cec97116d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 31 14:19:31 2015 +0200

    Releasing debian version 3.2.8-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 224c096..1e0e922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.2.8-1) unstable; urgency=medium
+
+  * Merging upstream version 3.2.8.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 31 Mar 2015 14:19:31 +0200
+
 tryton-client (3.2.7-1) unstable; urgency=medium
 
   * Adding actual upstream signing key.
commit 27e051c76536ae61ba897f07a96ea061cf7c7243
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 31 14:19:30 2015 +0200

    Merging upstream version 3.2.8.

diff --git a/CHANGELOG b/CHANGELOG
index 2b4c0f7..e8441eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.8 - 2015-03-30
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.7 - 2015-02-16
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index e9489ce..c983516 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.2.7
+Version: 3.2.8
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index e9489ce..c983516 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.7
+Version: 3.2.8
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/action/main.py b/tryton/action/main.py
index 00ae9d9..71431b9 100644
--- a/tryton/action/main.py
+++ b/tryton/action/main.py
@@ -103,7 +103,7 @@ class Action(object):
 
             action.setdefault('pyson_domain', '[]')
             ctx = {
-                'active_model': data.get('res_model'),
+                'active_model': data.get('model'),
                 'active_id': data.get('id'),
                 'active_ids': data.get('ids', []),
             }
diff --git a/tryton/common/domain_inversion.py b/tryton/common/domain_inversion.py
index e2b8a12..892c01a 100644
--- a/tryton/common/domain_inversion.py
+++ b/tryton/common/domain_inversion.py
@@ -143,7 +143,7 @@ def localize_domain(domain, field_name=None):
         if isinstance(domain[2], basestring):
             locale_name = 'rec_name'
         return [locale_part(domain[0], field_name, locale_name)] \
-            + list(domain[1:])
+            + list(domain[1:3]) + list(domain[4:])
     else:
         return [localize_domain(part, field_name) for part in domain]
 
@@ -573,6 +573,12 @@ def test_localize():
     domain = [['x', 'child_of', [1], 'y']]
     assert localize_domain(domain, 'x') == [['y', 'child_of', [1]]]
 
+    domain = [['x.id', '=', 1, 'y']]
+    assert localize_domain(domain, 'x') == [['id', '=', 1]]
+
+    domain = [['a.b.c', '=', 1, 'y', 'z']]
+    assert localize_domain(domain, 'x') == [['b.c', '=', 1, 'z']]
+
 if __name__ == '__main__':
     test_simple_inversion()
     test_and_inversion()
diff --git a/tryton/common/domain_parser.py b/tryton/common/domain_parser.py
index 76188ce..62b8dce 100644
--- a/tryton/common/domain_parser.py
+++ b/tryton/common/domain_parser.py
@@ -117,6 +117,8 @@ def quote(value):
     "Quote string if needed"
     if not isinstance(value, basestring):
         return value
+    if '\\' in value:
+        value = value.replace('\\', '\\\\')
     if '"' in value:
         value = value.replace('"', '\\"')
     for test in (':', ' ', '(', ')') + OPERATORS:
@@ -129,6 +131,7 @@ def test_quote():
     assert quote('test') == 'test'
     assert quote('foo bar') == '"foo bar"'
     assert quote('"foo"') == '\\\"foo\\\"'
+    assert quote('foo\\bar') == 'foo\\\\bar'
 
 
 def ending_clause(domain, deep=0):
diff --git a/tryton/version.py b/tryton/version.py
index 9960e63..56609f3 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.7"
+VERSION = "3.2.8"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client