[ADD] doc: new documentation, with training tutorials, and new scaffolding

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

diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng
index 7f2067f..b27b92c 100644 (file)
--- a/openerp/import_xml.rng
+++ b/openerp/import_xml.rng
@@ -19,80 +19,54 @@
     <rng:define name="value">
         <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:optional><rng:text/></rng:optional>
-        </rng:element>
-    </rng:define>
-
-    <rng:define name="function">
-        <rng:element name="function">
-            <rng:attribute name="model" />
-            <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>
+                <rng:attribute name="search" />
+                <rng:attribute name="eval" />
+                <rng:group>
+                    <rng:optional><rng:attribute name="type" /></rng:optional>
                     <rng:choice>
-                        <rng:ref name="value" />
-                        <rng:ref name="function" />
+                        <rng:attribute name="file" />
+                        <rng:text/>
                     </rng:choice>
-                </rng:oneOrMore>
+                </rng:group>
             </rng:choice>
         </rng:element>
     </rng:define>
 
-    <rng:define name="assert">
-        <rng:element name="assert">
+    <rng:define name="function">
+        <rng:element name="function">
             <rng:attribute name="model" />
-            <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:attribute name="name" />
+            <!-- doesn't look like it has any use? -->
             <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:zeroOrMore>
-                <rng:element name="test">
-                    <rng:attribute name="expr"/>
-                    <rng:choice>
-                        <rng:text />
-                        <rng:empty />
-                    </rng:choice>
-                </rng:element>
-            </rng:zeroOrMore>
+            <rng:optional>
+                <rng:choice>
+                    <rng:attribute name="eval" />
+                    <rng:oneOrMore>
+                        <rng:choice>
+                            <rng:ref name="value" />
+                            <rng:ref name="function" />
+                        </rng:choice>
+                    </rng:oneOrMore>
+                </rng:choice>
+            </rng:optional>
         </rng:element>
     </rng:define>
 
     <rng:define name="workflow">
         <rng:element name="workflow">
             <rng:attribute name="model" />
-            <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:attribute name="ref" />
                 <rng:ref name="value"/>
             </rng:choice>
         </rng:element>
     </rng:define>
 
-    <rng:define name="wizard">
-        <rng:element name="wizard">
-            <rng:attribute name="name"/>
-            <rng:attribute name="id" />
-            <rng:optional><rng:attribute name="menu" /></rng:optional>
-            <rng:optional><rng:attribute name="model" /></rng:optional>
-            <rng:attribute name="string" />
-            <rng:optional><rng:attribute name="keyword" /></rng:optional>
-            <rng:optional><rng:attribute name="multi" /></rng:optional>
-            <rng:optional><rng:attribute name="client_action_multi" /></rng:optional>
-            <rng:optional> <rng:attribute name="groups"/> </rng:optional>
-        </rng:element>
-    </rng:define>
-
     <rng:define name="report">
         <rng:element name="report">
             <rng:optional><rng:attribute name="id"/></rng:optional>
@@ -197,13 +171,17 @@
 
     <rng:define name="record">
         <rng:element name="record">
-            <rng:optional><rng:attribute name="id" /> </rng:optional>
+            <rng:optional>
+                <rng:attribute name="id" />
+                <rng:optional>
+                    <rng:attribute name="forcecreate" />
+                </rng:optional>
+            </rng:optional>
             <rng:attribute name="model" />
-            <rng:optional><rng:attribute name="forcecreate" /></rng:optional>
+            <rng:optional><rng:attribute name="context"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field" />
             </rng:zeroOrMore>
-            <rng:optional><rng:attribute name="context"/></rng:optional>
         </rng:element>
     </rng:define>
 
@@ -251,40 +229,63 @@
     <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>
-                <rng:ref name="field" />
-            </rng:oneOrMore>
+            <rng:choice>
+                <rng:attribute name="id" />
+                <rng:attribute name="search" />
+            </rng:choice>
         </rng:element>
     </rng:define>
 
     <rng:define name="menuitem">
         <rng:element name="menuitem">
-            <!-- L'identifiant devrait être obligatoire -->
+            <!-- TODO: id should probably be mandatory -->
             <rng:optional> <rng:attribute name="id" /></rng:optional>
-            <!-- Attention le nom peut disparaitre uniquement si le parent est présent -->
             <rng:optional> <rng:attribute name="name"/></rng:optional>
             <rng:optional> <rng:attribute name="parent"/> </rng:optional>
+            <rng:optional> <rng:attribute name="action"/> </rng:optional>
+            <rng:optional> <rng:attribute name="sequence"/> </rng:optional>
+            <rng:optional> <rng:attribute name="groups"/> </rng:optional>
+            <!-- TODO: remove icon stuff -->
             <rng:optional> <rng:attribute name="icon"/> </rng:optional>
             <rng:optional> <rng:attribute name="web_icon"/> </rng:optional>
             <rng:optional> <rng:attribute name="web_icon_hover"/> </rng:optional>
-            <rng:optional> <rng:attribute name="action"/> </rng:optional>
+            <!-- string doesn't seem used anywhere -->
             <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="menu"/> </rng:optional>
             <rng:empty />
         </rng:element>
     </rng:define>
 
+    <!-- TODO: remove these, useless -->
+
+    <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="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:zeroOrMore>
+                <rng:element name="test">
+                    <rng:attribute name="expr"/>
+                    <rng:choice>
+                        <rng:text />
+                        <rng:empty />
+                    </rng:choice>
+                </rng:element>
+            </rng:zeroOrMore>
+        </rng:element>
+    </rng:define>
+
+    <rng:define name="ir_set">
+        <rng:element name="ir_set">
+            <rng:oneOrMore>
+                <rng:ref name="field" />
+            </rng:oneOrMore>
+        </rng:element>
+    </rng:define>
+
     <rng:define name="url">
         <rng:element name="url">
             <rng:attribute name="id" />
@@ -328,7 +329,6 @@
                     <rng:ref name="record" />
                     <rng:ref name="template" />
                     <rng:ref name="delete" />
-                    <rng:ref name="wizard" />
                     <rng:ref name="act_window" />
                     <rng:ref name="url" />
                     <rng:ref name="assert" />