osv: Improve the translation logic for the osv.check wrapper

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

diff --git a/bin/import_xml.rng b/bin/import_xml.rng
index d1aa67f..7b5a889 100644 (file)
--- a/bin/import_xml.rng
+++ b/bin/import_xml.rng
@@ -32,6 +32,7 @@
             <rng:attribute name="name" />
             <rng:optional><rng:attribute name="id" /></rng:optional>
             <rng:optional><rng:attribute name="eval" /></rng:optional>
+            <rng:optional><rng:attribute name="context" /></rng:optional>
             <rng:choice>
                 <rng:empty />
                 <rng:oneOrMore>
@@ -47,11 +48,13 @@
     <rng:define name="assert">
         <rng:element name="assert">
             <rng:attribute name="model" />
-            <rng:optional><rng:attribute name="search" /> </rng:optional>
+            <rng:optional><rng:attribute name="search" /></rng:optional>
+            <rng:optional><rng:attribute name="count" /></rng:optional>
             <rng:optional><rng:attribute name="string" /></rng:optional>
             <rng:optional><rng:attribute name="id" /></rng:optional>
+            <rng:optional><rng:attribute name="context" /></rng:optional>
             <rng:optional><rng:attribute name="severity" /></rng:optional>
-            <rng:oneOrMore>
+            <rng:zeroOrMore>
                 <rng:element name="test">
                     <rng:attribute name="expr"/>
                     <rng:choice>
@@ -59,7 +62,7 @@
                         <rng:empty />
                     </rng:choice>
                 </rng:element>
-            </rng:oneOrMore>
+            </rng:zeroOrMore>
         </rng:element>
     </rng:define>
 
@@ -69,6 +72,7 @@
             <rng:optional><rng:attribute name="ref" /></rng:optional>
             <rng:attribute name="action"/>
             <rng:optional><rng:attribute name="uid"/></rng:optional>
+            <rng:optional><rng:attribute name="context" /></rng:optional>
             <rng:choice>
                 <rng:empty/>
                 <rng:ref name="value"/>
@@ -96,15 +100,19 @@
             <rng:attribute name="string"/>
             <rng:attribute name="model"/>
             <rng:attribute name="name"/>
+            <rng:optional><rng:attribute name="report_type"/></rng:optional>
             <rng:optional><rng:attribute name="multi"/></rng:optional>
             <rng:optional><rng:attribute name="menu"/></rng:optional>
             <rng:optional><rng:attribute name="keyword"/></rng:optional>
-            <rng:optional><rng:attribute name="rml"/></rng:optional>
+            <rng:optional><rng:attribute name="rml"/></rng:optional><!-- pending deprecation after v6.0 -->
+            <rng:optional><rng:attribute name="file"/></rng:optional>
+            <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="auto" /> </rng:optional>
             <rng:optional> <rng:attribute name="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>
             <rng:empty />
         </rng:element>
@@ -135,12 +143,23 @@
             <rng:optional><rng:attribute name="id" /> </rng:optional>
             <rng:attribute name="model" />
             <rng:optional><rng:attribute name="forcecreate" /></rng:optional>
-            <rng:oneOrMore>
+            <rng:zeroOrMore>
                 <rng:ref name="field" />
-            </rng:oneOrMore>
+            </rng:zeroOrMore>
+            <rng:optional><rng:attribute name="context"/></rng:optional>
         </rng:element>
     </rng:define>
 
+    <rng:define name="delete">
+        <rng:element name="delete">
+            <rng:attribute name="model" />
+                <rng:choice>
+                    <rng:attribute name="id" />
+                    <rng:attribute name="search" />
+                </rng:choice>
+            </rng:element>
+    </rng:define>
+
     <rng:define name="ir_set">
         <rng:element name="ir_set">
             <rng:oneOrMore>
@@ -181,7 +200,11 @@
             <rng:optional> <rng:attribute name="view_mode"/> </rng:optional>
             <rng:optional> <rng:attribute name="multi"/> </rng:optional>
             <rng:optional> <rng:attribute name="target"/> </rng:optional>
+            <rng:optional> <rng:attribute name="key2"/> </rng:optional>
             <rng:optional> <rng:attribute name="groups"/> </rng:optional>
+            <rng:optional> <rng:attribute name="limit"/> </rng:optional>
+            <rng:optional> <rng:attribute name="usage"/> </rng:optional>
+            <rng:optional> <rng:attribute name="auto_refresh"/> </rng:optional>
             <rng:empty />
         </rng:element>
     </rng:define>
@@ -189,11 +212,13 @@
     <rng:define name="data">
         <rng:element name="data">
             <rng:optional><rng:attribute name="noupdate" /></rng:optional>
+            <rng:optional><rng:attribute name="context" /></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:text/>
                     <rng:ref name="menuitem" />
                     <rng:ref name="record" />
+                    <rng:ref name="delete" />
                     <rng:ref name="wizard" />
                     <rng:ref name="act_window" />
                     <rng:ref name="assert" />