From 1fd9d1e908766f1ae23c191306c9b4e8a1c6dcaa Mon Sep 17 00:00:00 2001
From: Jigar Patel <jat@openerp.com>
Date: Mon, 3 Jun 2019 11:03:14 +0000
Subject: [PATCH] [FIX] base: allow users to define fields and templates in any
 order for Gantt View

Before this commit, if you try to define some field tags before the
templates tag in a gantt view you will get a validation error.

closes odoo/odoo#33826

Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 odoo/addons/base/rng/gantt_view.rng | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/odoo/addons/base/rng/gantt_view.rng b/odoo/addons/base/rng/gantt_view.rng
index 7d9b2dcc00c..1b0b2b03f63 100644
--- a/odoo/addons/base/rng/gantt_view.rng
+++ b/odoo/addons/base/rng/gantt_view.rng
@@ -37,13 +37,6 @@
             </rng:optional>
 
             <rng:optional><rng:attribute name="precision"/></rng:optional>
-            <rng:optional>
-                <rng:element name="templates">
-                    <rng:oneOrMore>
-                        <rng:ref name="any"/>
-                    </rng:oneOrMore>
-                </rng:element>
-            </rng:optional>
 
             <rng:optional><rng:attribute name="color"/></rng:optional>
 
@@ -53,11 +46,17 @@
             <rng:optional><rng:attribute name="decoration-warning"/></rng:optional>
             <rng:optional><rng:attribute name="decoration-danger"/></rng:optional>
 
-            <rng:zeroOrMore>
-                <rng:choice>
-                    <rng:ref name="field"/>
-                </rng:choice>
-            </rng:zeroOrMore>
+            <rng:interleave>
+                <rng:zeroOrMore><rng:ref name="field"/></rng:zeroOrMore>
+                <rng:optional>
+                    <rng:element name="templates">
+                        <rng:oneOrMore>
+                            <rng:ref name="any"/>
+                        </rng:oneOrMore>
+                    </rng:element>
+                </rng:optional>
+            </rng:interleave>
+
             <rng:empty/>
         </rng:element>
     </rng:define>