[MERGE] Merge with trunk server upto revision no 3569.

[odoo/odoo.git] / openerp / addons / base / rng / view.rng

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index f3c8b15..3cad1a9 100644 (file)
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -81,12 +81,8 @@
     <rng:define name="diagram">
         <rng:element name="diagram">
             <rng:optional><rng:attribute name="string"/></rng:optional>
-            <rng:zeroOrMore>
-                <rng:choice>
-                    <rng:ref name="node"/>
-                    <rng:ref name="arrow"/>
-                </rng:choice>
-            </rng:zeroOrMore>
+            <rng:ref name="node"/>
+            <rng:ref name="arrow"/>
         </rng:element>
     </rng:define>
 
@@ -96,11 +92,9 @@
             <rng:optional><rng:attribute name="shape"/></rng:optional>
             <rng:optional><rng:attribute name="bgcolor"/></rng:optional>
             <rng:optional><rng:attribute name="form_view_ref"/></rng:optional>
-            <rng:zeroOrMore>
-                <rng:choice>
-                    <rng:ref name="field"/>
-                </rng:choice>
-            </rng:zeroOrMore>
+            <rng:oneOrMore>
+              <rng:ref name="field"/>
+            </rng:oneOrMore>
         </rng:element>
     </rng:define>
 
@@ -111,31 +105,22 @@
             <rng:attribute name="destination" />
             <rng:optional><rng:attribute name="form_view_ref"/></rng:optional>
             <rng:optional><rng:attribute name="label"/></rng:optional>
-            <rng:zeroOrMore>
-                <rng:choice>
-                    <rng:ref name="field"/>
-                </rng:choice>
-            </rng:zeroOrMore>
+            <rng:oneOrMore>
+              <rng:ref name="field"/>
+            </rng:oneOrMore>
         </rng:element>
     </rng:define>
 
     <rng:define name="kanban">
         <rng:element name="kanban">
             <rng:zeroOrMore>
-                <rng:choice>
-                    <rng:ref name="template"/>
-                </rng:choice>
+                <rng:ref name="field"/>
             </rng:zeroOrMore>
-        </rng:element>
-    </rng:define>
-
-    <rng:define name="template">
-        <rng:element name="template">
-            <rng:zeroOrMore>
-                <rng:choice>
+            <rng:element name="templates">
+                <rng:oneOrMore>
                     <rng:ref name="any"/>
-                </rng:choice>
-            </rng:zeroOrMore>
+                </rng:oneOrMore>
+            </rng:element>
         </rng:element>
     </rng:define>
 
@@ -464,7 +449,6 @@
             <rng:optional><rng:attribute name="operator"/></rng:optional>
             <rng:optional><rng:attribute name="colspan"/></rng:optional>
             <rng:optional><rng:attribute name="nolabel"/></rng:optional>
-            <rng:optional><rng:attribute name="default"/></rng:optional>
             <rng:optional><rng:attribute name="default_get"/></rng:optional>
             <rng:optional><rng:attribute name="required"/></rng:optional>
             <rng:optional><rng:attribute name="readonly"/></rng:optional>
@@ -622,7 +606,6 @@
             <rng:optional><rng:attribute name="context"/></rng:optional>
             <rng:optional><rng:attribute name="help"/></rng:optional>
             <rng:optional><rng:attribute name="domain"/></rng:optional>
-            <rng:optional><rng:attribute name="default"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="form" />