From 68fec442a883fd7a87b7ffa33ff0d761d63b22f2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 25 Jun 2008 05:35:33 +0000
Subject: [PATCH] Modifs

bzr revid: fp@tinyerp.com-7c69b81d39e45262fb95b85202d1cd69710e5537
---
 bin/addons/base/module/module_view.xml | 23 ++++-------------------
 bin/workflow/wkf_expr.py               |  1 +
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index e51897e3a3e..2808a76d577 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -200,17 +200,6 @@
 			id="menu_module_repository_tree"
 			/>
 
-
-
-
-
-
-
-
-
-
-
-
 		<record model="ir.ui.view" id="config_wizard_step_view_tree">
             <field name="model">ir.module.module.configuration.step</field>
             <field name="type">tree</field>
@@ -229,15 +218,10 @@
             <field name="view_id" ref="config_wizard_step_view_tree"/>
             <field name="view_type">form</field>
         </record>
-
-
-        <menuitem name="Administration/Modules Management/Config wizard Step"
+        <menuitem name="Administration/Custom/Configuration Wizards/List of Configuration Wizards"
             action="act_config_wizard_step_form"
             id="menu_config_wizard_step_form"/>
 
-
-
-
 		<record model="ir.ui.view" id="view_config_wizard_form">
 		<field name="name">Main Configuration wizard</field>
 		<field name="model">ir.module.module.configuration.wizard</field>
@@ -266,8 +250,9 @@
 		</record>
 
 		<menuitem
-		name="Administration/Modules Management/Module Configuration"
-		action="action_config_wizard_form"  id="menu_config_module"/>
+			name="Administration/Custom/Configuration Wizards/Launch Configurator"
+			action="action_config_wizard_form"
+			id="menu_config_module"/>
 
 
 
diff --git a/bin/workflow/wkf_expr.py b/bin/workflow/wkf_expr.py
index 9a86b474f86..f1476cc8188 100644
--- a/bin/workflow/wkf_expr.py
+++ b/bin/workflow/wkf_expr.py
@@ -70,6 +70,7 @@ class Env(dict):
 
 def _eval_expr(cr, ident, workitem, action):
 	ret=False
+	assert action, 'You used a NULL action in a workflow, use dummy node instead.'
 	for line in action.split('\n'):
 		uid=ident[0]
 		model=ident[1]