[tryton-debian-vcs] tryton-proteus branch upstream-3.8 updated. upstream/3.8.1-1-g5635c3b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Jul 12 13:07:04 UTC 2016
The following commit has been merged in the upstream-3.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-proteus.git;a=commitdiff;h=upstream/3.8.1-1-g5635c3b
commit 5635c3b99315392ce24616cb3760337b716980c9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 19:52:42 2016 +0200
Adding upstream version 3.8.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index f00fe39..d1ae480 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.2 - 2016-07-04
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.1 - 2016-01-11
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 674c885..29bd825 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010-2015 Cédric Krier.
-Copyright (C) 2010-2015 B2CK SPRL.
+Copyright (C) 2010-2016 Cédric Krier.
+Copyright (C) 2010-2016 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 8be1447..00f08f4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: proteus
-Version: 3.8.1
+Version: 3.8.2
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 8be1447..00f08f4 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.8.1
+Version: 3.8.2
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 b8145a5..05f870c 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.8, < 3.9
-
-[simplejson]
-simplejson
\ No newline at end of file
diff --git a/proteus/__init__.py b/proteus/__init__.py
index dc1906d..1bf7b0e 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.8.1"
+__version__ = "3.8.2"
__all__ = ['Model', 'Wizard', 'Report']
import sys
try:
@@ -1074,7 +1074,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
@@ -1096,7 +1096,6 @@ 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
@@ -1107,6 +1106,9 @@ class Wizard(object):
if proteus_action:
self.actions.append(proteus_action)
+ if 'view' in result:
+ return
+
if self.state == self.end_state:
self._proxy.delete(self.session_id, self._config.context)
if self.models:
diff --git a/proteus/tests/test_wizard.py b/proteus/tests/test_wizard.py
index d2c384f..7edf200 100644
--- a/proteus/tests/test_wizard.py
+++ b/proteus/tests/test_wizard.py
@@ -46,3 +46,8 @@ class TestWizard(ProteusTestCase):
self.assertEqual(len(print_model_graph.actions), 0)
print_model_graph.execute('update')
self.assertEqual(len(print_model_graph.actions), 1)
+
+ def test_configuration_wizard(self):
+ config_wizard = Wizard('ir.module.config_wizard')
+ config_wizard.execute('action')
+ self.assertTrue(config_wizard.actions)
--
tryton-proteus
More information about the tryton-debian-vcs
mailing list