[tryton-debian-vcs] tryton-client branch upstream-2.8 updated. upstream/2.8.12-1-g4098a29

[Mathias Behrle]

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

commit 4098a29f1f89e100a7ff67ce7cfb1c99710bcedf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 31 14:17:11 2015 +0200

    Adding upstream version 2.8.13.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index f0bdfd8..28d395b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.13 - 2015-03-30
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.12 - 2015-02-16
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index d11b707..f65a6df 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 2.8.12
+Version: 2.8.13
 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 d11b707..f65a6df 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.8.12
+Version: 2.8.13
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/action/main.py b/tryton/action/main.py
index f6594dc..ac3688e 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 4f286cf..ffb1b61 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 c001058..c3d3692 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.8.12"
+VERSION = "2.8.13"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client