[tryton-debian-vcs] tryton-client branch debian-jessie-3.0 updated. debian/3.0.9-1-2-g151c2a8

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.0.9-1-2-g151c2a8

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

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

diff --git a/debian/changelog b/debian/changelog
index b5a0161..5810577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.0.10-1) unstable; urgency=medium
+
+  * Merging upstream version 3.0.10.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 31 Mar 2015 14:18:18 +0200
+
 tryton-client (3.0.9-1) unstable; urgency=medium
 
   * Adding actual upstream signing key.
commit 9091b3b54729142a988b94e5d0df935e39d9ad74
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 31 14:18:17 2015 +0200

    Merging upstream version 3.0.10.

diff --git a/CHANGELOG b/CHANGELOG
index e843afa..0827763 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.10 - 2015-03-30
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.9 - 2015-02-16
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 77166f3..c977649 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.0.9
+Version: 3.0.10
 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 77166f3..c977649 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.0.9
+Version: 3.0.10
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/action/main.py b/tryton/action/main.py
index d06afb0..99caf0e 100644
--- a/tryton/action/main.py
+++ b/tryton/action/main.py
@@ -96,7 +96,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', False),
                 'active_ids': data.get('ids', []),
             }
diff --git a/tryton/common/domain_parser.py b/tryton/common/domain_parser.py
index 195dda3..a4fce22 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 2b2faeb..a969122 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.0.9"
+VERSION = "3.0.10"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client