From dde6191c15e0ffe1f0ecaedbf1bfaae5592ffa2d Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 2 Aug 2011 15:06:59 +0530
Subject: [PATCH 1/4] [ADD] add new kanban view.

bzr revid: ysa@tinyerp.com-20110802093659-btfev13seawo2d46
---
 openerp/addons/base/ir/ir_ui_view.py |  1 +
 openerp/addons/base/rng/view.rng     | 39 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index ee23a2f52f1..c112d799342 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -73,6 +73,7 @@ class view(osv.osv):
             ('calendar', 'Calendar'),
             ('diagram','Diagram'),
             ('gantt', 'Gantt'),
+            ('kanban', 'Kanban'),
             ('search','Search')), 'View Type', required=True, select=True),
         'arch': fields.text('View Architecture', required=True),
         'inherit_id': fields.many2one('ir.ui.view', 'Inherited View', ondelete='cascade', select=True),
diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index 943b533e2e3..d4ef442e2f8 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -119,6 +119,43 @@
         </rng:element>
     </rng:define>
 
+    <rng:define name="kanban">
+        <rng:element name="kanban">
+            <rng:zeroOrMore>
+                <rng:choice>
+                    <rng:ref name="colors"/>
+                    <rng:ref name="template"/>
+                </rng:choice>
+            </rng:zeroOrMore>
+        </rng:element>
+    </rng:define>
+
+    <rng:define name="colors">
+        <rng:element name="colors">
+            <rng:zeroOrMore>
+                <rng:choice>
+                    <rng:ref name="color"/>
+                </rng:choice>
+            </rng:zeroOrMore>
+        </rng:element>
+    </rng:define>
+
+    <rng:define name="color">
+        <rng:element name="color">
+            <rng:optional><rng:attribute name="condition"/><rng:text/></rng:optional>
+        </rng:element>
+    </rng:define>
+
+    <rng:define name="template">
+        <rng:element name="template">
+            <rng:zeroOrMore>
+                <rng:choice>
+                    <rng:ref name="any"/>
+                </rng:choice>
+            </rng:zeroOrMore>
+        </rng:element>
+    </rng:define>
+
     <rng:define name="tree">
         <rng:element name="tree">
             <rng:ref name="overload"/>
@@ -469,6 +506,7 @@
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="diagram"/>
+                    <rng:ref name="kanban"/>
                     <rng:ref name="form"/>
                     <rng:ref name="data"/>
                     <rng:ref name="tree"/>
@@ -628,6 +666,7 @@
     <rng:start>
         <rng:choice>
             <rng:ref name="diagram" />
+            <rng:ref name="kanban" />
             <rng:ref name="form" />
             <rng:ref name="search" />
             <rng:ref name="group" />

From 877f9c70a8e754469b786517b85149e6f31289a5 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 2 Aug 2011 17:41:30 +0530
Subject: [PATCH 2/4] [IMP] Remove colors tag in kanban view.

bzr revid: ysa@tinyerp.com-20110802121130-l33fu0c279xztwgl
---
 openerp/addons/base/rng/view.rng | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index d4ef442e2f8..f3c8b15415c 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -123,29 +123,12 @@
         <rng:element name="kanban">
             <rng:zeroOrMore>
                 <rng:choice>
-                    <rng:ref name="colors"/>
                     <rng:ref name="template"/>
                 </rng:choice>
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>
 
-    <rng:define name="colors">
-        <rng:element name="colors">
-            <rng:zeroOrMore>
-                <rng:choice>
-                    <rng:ref name="color"/>
-                </rng:choice>
-            </rng:zeroOrMore>
-        </rng:element>
-    </rng:define>
-
-    <rng:define name="color">
-        <rng:element name="color">
-            <rng:optional><rng:attribute name="condition"/><rng:text/></rng:optional>
-        </rng:element>
-    </rng:define>
-
     <rng:define name="template">
         <rng:element name="template">
             <rng:zeroOrMore>

From 757353a0a96123ff1376f9ea8479914c3e578dd9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 29 Aug 2011 17:27:57 +0200
Subject: [PATCH 3/4] [IMP] Improved rng for kanban view

bzr revid: fme@openerp.com-20110829152757-juq5aaryom6dtc12
---
 openerp/addons/base/rng/view.rng | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index f3c8b15415c..02ab1b64d53 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -121,21 +121,11 @@
 
     <rng:define name="kanban">
         <rng:element name="kanban">
-            <rng:zeroOrMore>
-                <rng:choice>
-                    <rng:ref name="template"/>
-                </rng:choice>
-            </rng:zeroOrMore>
-        </rng:element>
-    </rng:define>
-
-    <rng:define name="template">
-        <rng:element name="template">
-            <rng:zeroOrMore>
-                <rng:choice>
+            <rng:element name="template">
+                <rng:oneOrMore>
                     <rng:ref name="any"/>
-                </rng:choice>
-            </rng:zeroOrMore>
+                </rng:oneOrMore>
+            </rng:element>
         </rng:element>
     </rng:define>
 

From 10e06c23005070394756635b77c37193093a5a9b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 31 Aug 2011 17:39:33 +0200
Subject: [PATCH 4/4] [IMP] Improved rng for kanban view

bzr revid: fme@openerp.com-20110831153933-jvpnrysi5hc42z04
---
 openerp/addons/base/rng/view.rng | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index 02ab1b64d53..b6557cc17e5 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -121,7 +121,10 @@
 
     <rng:define name="kanban">
         <rng:element name="kanban">
-            <rng:element name="template">
+            <rng:zeroOrMore>
+                <rng:ref name="field"/>
+            </rng:zeroOrMore>
+            <rng:element name="templates">
                 <rng:oneOrMore>
                     <rng:ref name="any"/>
                 </rng:oneOrMore>