From 059739ca8618c771aa07de3fc4913f40d63ef263 Mon Sep 17 00:00:00 2001
From: ashish <ashish@ashish-laptop>
Date: Fri, 12 Dec 2008 12:10:25 +0530
Subject: [PATCH] * Bug Fix

bzr revid: ashish@ashish-laptop-20081212064025-fgxz8v3walwazppx
---
 bin/addons/base/rng/view.rng | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index 4dbfa512a14..82ef44dd0f5 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -35,14 +35,13 @@
             <rng:optional><rng:attribute name="toolbar"/></rng:optional>
             <rng:optional><rng:attribute name="position"/></rng:optional>
             <rng:optional><rng:attribute name="link"/></rng:optional>
-            <rng:optional><rng:attribute name="type"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="field"/>
                     <rng:ref name="separator"/>
                     <rng:ref name="tree"/>
-                    <rng:ref name="button"/>
                     <rng:ref name="group"/>
+                    <rng:ref name="button"/>
                     <rng:element name="newline"><rng:empty/></rng:element>
                 </rng:choice>
             </rng:zeroOrMore>
@@ -61,10 +60,6 @@
             <rng:optional><rng:attribute name="nolabel"/></rng:optional>
             <rng:optional><rng:attribute name="colspan"/></rng:optional>
             <rng:optional><rng:attribute name="string"/></rng:optional>
-            <rng:optional><rng:attribute name="angle"/></rng:optional>
-            <rng:zeroOrMore>
-               <rng:text/>
-            </rng:zeroOrMore>
         </rng:element>
     </rng:define>
 
@@ -219,7 +214,6 @@
             <rng:optional><rng:attribute name="readonly"/></rng:optional>
             <rng:optional><rng:attribute name="view_mode"/></rng:optional>
             <rng:optional><rng:attribute name="widget"/></rng:optional>
-            <rng:optional><rng:attribute name="comparator"/></rng:optional>
             <rng:optional><rng:attribute name="context"/></rng:optional>
             <rng:optional><rng:attribute name="groups"/></rng:optional>
             <rng:optional><rng:attribute name="states"/></rng:optional>
@@ -233,11 +227,10 @@
             <rng:optional><rng:attribute name="filename"/></rng:optional>
             <rng:optional><rng:attribute name="fieldname"/></rng:optional>
             <rng:optional><rng:attribute name="height"/></rng:optional>
-            <rng:optional><rng:attribute name="align"/></rng:optional>
+            <rng:optional><rng:attribute name="rowspan"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="form"/>
-                    <rng:ref name="calendar"/>
                     <rng:ref name="tree"/>
                     <rng:ref name="field"/>
                     <rng:ref name="label"/>
@@ -245,7 +238,6 @@
                     <rng:ref name="xpath"/>
                     <rng:ref name="button"/>
                     <rng:ref name="group"/>
-                    <rng:ref name="graph"/>
                     <rng:element name="newline"><rng:empty/></rng:element>
                 </rng:choice>
             </rng:zeroOrMore>
@@ -265,7 +257,6 @@
             <rng:optional><rng:attribute name="fill"/></rng:optional>
             <rng:optional><rng:attribute name="height"/></rng:optional>
             <rng:optional><rng:attribute name="name"/></rng:optional>
-            <rng:optional><rng:attribute name="color" /></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="separator"/>
@@ -288,7 +279,6 @@
             <rng:optional><rng:attribute name="date_stop" /></rng:optional>
             <rng:optional><rng:attribute name="day_length" /></rng:optional>
             <rng:optional><rng:attribute name="date_delay" /></rng:optional>
-            <rng:optional><rng:attribute name="type" /></rng:optional>
             <rng:oneOrMore>
                 <rng:ref name="field"/>
             </rng:oneOrMore>
@@ -300,7 +290,6 @@
             <rng:optional><rng:attribute name="string" /></rng:optional>
             <rng:optional><rng:attribute name="orientation" /></rng:optional>
             <rng:optional><rng:attribute name="type" /></rng:optional>
-            <rng:optional><rng:attribute name="color"/></rng:optional>
             <rng:oneOrMore>
                 <rng:ref name="field"/>
             </rng:oneOrMore>