From 5be3b32b54053cbac295724d1d12653e9ebf41d8 Mon Sep 17 00:00:00 2001
From: Husen Daudi <hda@tinyerp.com>
Date: Fri, 12 Dec 2008 11:27:18 +0530
Subject: [PATCH 1/4] bugfix

bzr revid: hda@tinyerp.com-20081212055718-164wjv8vr7v9oeba
---
 bin/addons/base/rng/view.rng | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index a02a3f3d680..432161bde38 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -260,6 +260,7 @@
             <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"/>
@@ -315,6 +316,7 @@
             <rng:optional><rng:attribute name="target"/></rng:optional>
             <rng:optional><rng:attribute name="readonly"/></rng:optional>
             <rng:optional><rng:attribute name="position"/></rng:optional>
+            <rng:optional><rng:attribute name="context"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="form" />

From 818bfe81264938736dfde070358c21fdd229e73c Mon Sep 17 00:00:00 2001
From: Naresh Choksy <nch@tinyerp.com>
Date: Fri, 12 Dec 2008 11:34:51 +0530
Subject: [PATCH 2/4] bugfix: for xml

bzr revid: nch@tinyerp.com-20081212060451-gt8d5gbnpvh5xn31
---
 bin/addons/base/rng/view.rng | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index 432161bde38..4dbfa512a14 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -61,6 +61,10 @@
             <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>
 
@@ -229,6 +233,7 @@
             <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:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="form"/>
@@ -295,6 +300,7 @@
             <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>

From 36770d1cadd9721cc18846fa68ee3ecc7456907a Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Fri, 12 Dec 2008 11:52:24 +0530
Subject: [PATCH 3/4] Minor edit in logger error message.

bzr revid: jvo@tinyerp.com-20081212062224-qwa5i5jaw4jbn260
---
 bin/addons/base/ir/ir_ui_view.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
index 30ec2135b3d..afe4990aefc 100644
--- a/bin/addons/base/ir/ir_ui_view.py
+++ b/bin/addons/base/ir/ir_ui_view.py
@@ -33,7 +33,7 @@ def _check_xml(self, cr, uid, ids, context={}):
         relaxng = etree.RelaxNG(file=frng)
         if not relaxng.validate(eview):
             logger = netsvc.Logger()
-            logger.notifyChannel('init', netsvc.LOG_ERROR, 'The view do not fit the required schema !')
+            logger.notifyChannel('init', netsvc.LOG_ERROR, 'The view does not fit the required schema !')
             logger.notifyChannel('init', netsvc.LOG_ERROR, relaxng.error_log.last_error)
             return False
     return True

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 4/4] * 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>