Merge lp:~kangol/openobject-server/6.0-correct-rng-label into lp:openobject-server/6.0

[Christophe Simonis (OpenERP)]

[Vo Minh Thu (thu)]

See Xavier's merge proposal around line 1180:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-schemas-improvements-xmo/+merge/53507

Please comment on his proposal; I will reject this one.

review: Disapprove

[Christophe Simonis (OpenERP) (kangol)]

Xavier's patch is for trunk.
If you consider it eligible for stable LTS version, please backport it.

Unmerged revisions

3405. By Christophe Simonis (OpenERP) on 2011-04-20

[FIX] rng for <label> tags

=== modified file 'bin/addons/base/rng/view.rng'
--- bin/addons/base/rng/view.rng	2010-12-27 10:41:55 +0000
+++ bin/addons/base/rng/view.rng	2011-04-20 16:37:55 +0000
@@ -197,22 +197,7 @@
             <rng:optional><rng:attribute name="width"/></rng:optional>
             <rng:optional><rng:attribute name="wrap"/></rng:optional>
             <rng:zeroOrMore>
-                <rng:choice>
-                    <rng:ref name="notebook"/>
-                    <rng:ref name="field"/>
-                    <rng:ref name="group"/>
-                    <rng:ref name="button"/>
-                    <rng:ref name="hpaned" />
-                    <rng:ref name="label" />
-                    <rng:ref name="separator"/>
-                    <rng:ref name="image"/>
-                    <rng:ref name="form"/>
-                    <rng:ref name="vpaned"/>
-                    <rng:ref name="filter"/>
-                    <rng:ref name="html"/>
-                    <rng:element name="newline"><rng:empty/></rng:element>
-                    <rng:element name="properties"><rng:empty/></rng:element>
-                </rng:choice>
+                <rng:text/>                
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>