[tryton-debian-vcs] tryton-proteus branch upstream-3.6 updated. upstream/3.6.3-1-ge677465

[Mathias Behrle]

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

commit e677465859d9dd201dcef13bd5c09e62bd198a77
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:51:25 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index d16ab95..44e98e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.4 - 2016-07-04
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.3 - 2016-01-11
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 53e05a2..6475e3e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 3.6.3
+Version: 3.6.4
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 53e05a2..6475e3e 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 3.6.3
+Version: 3.6.4
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus.egg-info/requires.txt b/proteus.egg-info/requires.txt
index 0a70047..bc728d6 100644
--- a/proteus.egg-info/requires.txt
+++ b/proteus.egg-info/requires.txt
@@ -3,8 +3,8 @@ python-dateutil
 [cdecimal]
 cdecimal
 
+[simplejson]
+simplejson
+
 [trytond]
 trytond >= 3.6, < 3.7
-
-[simplejson]
-simplejson
\ No newline at end of file
diff --git a/proteus/__init__.py b/proteus/__init__.py
index 5862a57..45cd3e8 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
 '''
 A library to access Tryton's models like a client.
 '''
-__version__ = "3.6.3"
+__version__ = "3.6.4"
 __all__ = ['Model', 'Wizard', 'Report']
 import sys
 try:
@@ -1073,7 +1073,7 @@ class Wizard(object):
                 ctx['active_ids'] = None
                 ctx['active_model'] = None
             if self.action:
-                ctx['action_id'] = self.action.id
+                ctx['action_id'] = self.action['id']
             else:
                 ctx['action_id'] = None
 
@@ -1095,13 +1095,15 @@ class Wizard(object):
                 self.form._default_set(view['defaults'])
                 self.states = [b['state'] for b in view['buttons']]
                 self.form_state = view['state']
-                return
             else:
                 self.state = self.end_state
 
             if 'actions' in result:
                 pass  # TODO
 
+            if 'view' in result:
+                return
+
         if self.state == self.end_state:
             self._proxy.delete(self.session_id, self._config.context)
             if self.models:
-- 
tryton-proteus