[tryton-debian-vcs] tryton-client branch debian-wheezy-2.6 updated. debian/2.6.15-1-2-ga94c6c1

[Mathias Behrle]

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

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

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

diff --git a/debian/changelog b/debian/changelog
index 5e04c5e..0852c33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (2.6.16-1) unstable; urgency=medium
+
+  * Merging upstream version 2.6.16.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 31 Mar 2015 14:16:17 +0200
+
 tryton-client (2.6.15-1) unstable; urgency=medium
 
   * Merging upstream version 2.6.15.
commit d93e3c9859d0be5bf5f545baaf1a8af81603ead5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 31 14:16:17 2015 +0200

    Merging upstream version 2.6.16.

diff --git a/CHANGELOG b/CHANGELOG
index d850c4b..dd39274 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.16 - 2015-03-30
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.15 - 2015-02-16
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index a337038..c37c5e1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 2.6.15
+Version: 2.6.16
 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 a337038..c37c5e1 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.15
+Version: 2.6.16
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/tryton/action/main.py b/tryton/action/main.py
index e466458..90e61ad 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 26e64f7..6b49f43 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 d9da2a0..84d637f 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.15"
+VERSION = "2.6.16"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client