[MERGE] tools.convert: allow to use relativedelta in XML files.

[odoo/odoo.git] / openerp / import_xml.rng

diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng
index bf5a9e1..5f4c40b 100644 (file)
--- a/openerp/import_xml.rng
+++ b/openerp/import_xml.rng
@@ -107,6 +107,7 @@
             <rng:optional><rng:attribute name="sxw"/></rng:optional>
             <rng:optional><rng:attribute name="xml"/></rng:optional>
             <rng:optional><rng:attribute name="xsl"/></rng:optional>
+            <rng:optional><rng:attribute name="parser"/></rng:optional>
             <rng:optional> <rng:attribute name="auto" /> </rng:optional>
             <rng:optional> <rng:attribute name="header" /> </rng:optional>
             <rng:optional> <rng:attribute name="webkit_header" /> </rng:optional>
@@ -185,7 +186,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>
@@ -247,17 +247,10 @@
     </rng:define>
 
     <rng:start>
-        <rng:choice>
-            <rng:element name="openerp">
-                <rng:oneOrMore>
-                    <rng:ref name="data" />
-                </rng:oneOrMore>
-            </rng:element>
-            <rng:element name="terp">
-                <rng:oneOrMore>
-                    <rng:ref name="data" />
-                </rng:oneOrMore>
-            </rng:element>
-        </rng:choice>
+        <rng:element name="openerp">
+            <rng:oneOrMore>
+                <rng:ref name="data" />
+            </rng:oneOrMore>
+        </rng:element>
     </rng:start>
 </rng:grammar>