[FIX] orm: replace incorrect usage of 'in' by '=='

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

diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng
index 75c4e8b..5dd789c 100644 (file)
--- a/openerp/import_xml.rng
+++ b/openerp/import_xml.rng
@@ -19,10 +19,8 @@
         <rng:element name="value">
             <rng:optional><rng:attribute name="model" /></rng:optional>
             <rng:optional><rng:attribute name="search" /></rng:optional>
-            <rng:optional>
-                <rng:attribute name="eval"/>
-            </rng:optional>
-            <rng:empty />
+            <rng:optional><rng:attribute name="eval" /></rng:optional>
+            <rng:optional><rng:text/></rng:optional>
         </rng:element>
     </rng:define>
 
@@ -111,9 +109,14 @@
             <rng:optional><rng:attribute name="xsl"/></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>
             <rng:optional> <rng:attribute name="attachment" /> </rng:optional>
             <rng:optional> <rng:attribute name="attachment_use" /> </rng:optional>
             <rng:optional> <rng:attribute name="groups"/> </rng:optional>
+            <!-- `Usage` may help identify the best report for a certain task,
+                 for example usage="default" for reports that are attached by
+                 default in EDI exports -->
+            <rng:optional><rng:attribute name="usage"/></rng:optional>
             <rng:empty />
         </rng:element>
     </rng:define>
@@ -182,12 +185,21 @@
             <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>
     </rng:define>
 
+    <rng:define name="url">
+        <rng:element name="url">
+            <rng:attribute name="id" />
+            <rng:attribute name="name" />
+            <rng:attribute name="url" />
+            <rng:optional><rng:attribute name="target" /></rng:optional>
+            <rng:empty />
+        </rng:element>
+    </rng:define>
+
     <rng:define name="act_window">
         <rng:element name="act_window">
             <rng:attribute name="id" />
@@ -222,6 +234,7 @@
                     <rng:ref name="delete" />
                     <rng:ref name="wizard" />
                     <rng:ref name="act_window" />
+                    <rng:ref name="url" />
                     <rng:ref name="assert" />
                     <rng:ref name="report" />
                     <rng:ref name="workflow" />