[IMP] rng: forbid redundant @type for menuitem, now inferred from the action type...

bzr revid: odo@openerp.com-20120822144946-fdsw9ee1ia3nfe86

diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng
index bf5a9e1..5dd789c 100644 (file)
--- a/openerp/import_xml.rng
+++ b/openerp/import_xml.rng
@@ -185,7 +185,6 @@
             <rng:optional> <rng:attribute name="string"/> </rng:optional>
             <rng:optional> <rng:attribute name="sequence"/> </rng:optional>
             <rng:optional> <rng:attribute name="groups"/> </rng:optional>
-            <rng:optional> <rng:attribute name="type"/> </rng:optional>
             <rng:optional> <rng:attribute name="menu"/> </rng:optional>
             <rng:empty />
         </rng:element>

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 5fd8888..8269fa5 100644 (file)
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -593,11 +593,11 @@ form: module.record_id""" % (xml_id,)
             a_action = rec.get('action','').encode('utf8')
 
             # determine the type of action
-            if ('.' in a_action):
-                # this is an action refering to another module: extract this module's name
+            if '.' in a_action:
+                # action referring to another module
                 a_action_module, a_action_name = a_action.split('.')
             else:
-                # this is a local action: fetch the current module's name
+                # local action: use current module
                 a_action_module = self.module
                 a_action_name = a_action