[FIX] orm: fix autogenerated tree view for object having no columns (taking 'id'...

[odoo/odoo.git] / bin / wizard / __init__.py

diff --git a/bin/wizard/__init__.py b/bin/wizard/__init__.py
index 34906ec..7302f4d 100644 (file)
--- a/bin/wizard/__init__.py
+++ b/bin/wizard/__init__.py
@@ -1,22 +1,21 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
-#
-#    OpenERP, Open Source Management Solution  
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
 
@@ -42,19 +41,19 @@ class except_wizard(Exception):
 
 class interface(netsvc.Service):
     states = {}
-    
+
     def __init__(self, name):
-        assert not netsvc.service_exist('wizard.'+name), 'The wizard "%s" already exists!'%name
+        assert not self.exists('wizard.'+name), 'The wizard "%s" already exists!' % (name,)
         super(interface, self).__init__('wizard.'+name)
         self.exportMethod(self.execute)
         self.wiz_name = name
-        
+
     def translate_view(self, cr, node, state, lang):
         if node.get('string'):
             trans = translate(cr, self.wiz_name+','+state, 'wizard_view', lang, node.get('string').encode('utf8'))
             if trans:
                 node.set('string', trans)
-        for n in node.getchildren():
+        for n in node:
             self.translate_view(cr, n, state, lang)
 
     def execute_cr(self, cr, uid, data, state='init', context=None):
@@ -149,6 +148,10 @@ class interface(netsvc.Service):
                 res['arch'] = arch
                 res['state'] = button_list
 
+            elif result_def['type'] == 'choice':
+                next_state = result_def['next_state'](self, cr, uid, data, context)
+                return self.execute_cr(cr, uid, data, next_state, context)
+        
         except Exception, e:
             if isinstance(e, except_wizard) \
                 or isinstance(e, except_osv) \
@@ -163,9 +166,6 @@ class interface(netsvc.Service):
                         'Exception in call: ' + tb_s)
                 raise
 
-        if result_def['type'] == 'choice':
-            next_state = result_def['next_state'](self, cr, uid, data, context)
-            return self.execute_cr(cr, uid, data, next_state, context)
         return res
 
     def execute(self, db, uid, data, state='init', context=None):