From 1fbaa11c6f2afcacafa5fe5c091d278d50401147 Mon Sep 17 00:00:00 2001
From: "kujiu (@havelock.kujiu.org)" <kujiu@kujiu.org>
Date: Thu, 21 Sep 2017 16:40:16 +0200
Subject: [PATCH] Revert "Add attributes and elements on XML views' checks to
 avoid errors with Studio (renamed_field and studio_groups) (#19623)"

This reverts commit fc5d6e1ab91094459e50720b0de712953cdc543b.
---
 odoo/addons/base/rng/calendar_view.rng |   1 -
 odoo/addons/base/rng/common.rng        | 248 +++++++++++--------------
 odoo/addons/base/rng/diagram_view.rng  |   3 -
 odoo/addons/base/rng/graph_view.rng    |   1 -
 odoo/addons/base/rng/pivot_view.rng    |   1 -
 odoo/addons/base/rng/search_view.rng   |   1 -
 odoo/addons/base/rng/tree_view.rng     |   1 -
 odoo/tools/view_validation.py          |   2 +-
 8 files changed, 108 insertions(+), 150 deletions(-)

diff --git a/odoo/addons/base/rng/calendar_view.rng b/odoo/addons/base/rng/calendar_view.rng
index 1f0958069e0..949c3f48318 100644
--- a/odoo/addons/base/rng/calendar_view.rng
+++ b/odoo/addons/base/rng/calendar_view.rng
@@ -30,7 +30,6 @@
             </rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
-                <rng:ref name="renamed_field"/>
             </rng:zeroOrMore>
             <rng:optional>
                 <rng:element name="template">
diff --git a/odoo/addons/base/rng/common.rng b/odoo/addons/base/rng/common.rng
index 314ad69cbf0..f213ba9bf0d 100644
--- a/odoo/addons/base/rng/common.rng
+++ b/odoo/addons/base/rng/common.rng
@@ -64,11 +64,9 @@
         <rng:zeroOrMore>
             <rng:choice>
                 <rng:ref name="field"/>
-                <rng:ref name="renamed_field"/>
                 <rng:ref name="group"/>
                 <rng:ref name="button"/>
                 <rng:ref name="label" />
-                <rng:ref name="renamed_label"/>
                 <rng:ref name="separator"/>
                 <rng:ref name="image"/>
                 <rng:ref name="filter"/>
@@ -93,52 +91,40 @@
         </rng:element>
     </rng:define>
 
-    <rng:define name="labelContent">
-        <rng:ref name="overload"/>
-        <rng:ref name="access_rights"/>
-        <rng:ref name="modifiable"/>
-        <rng:optional><rng:attribute name="invisible"/></rng:optional>
-        <rng:optional><rng:attribute name="align"/></rng:optional>
-        <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:optional><rng:attribute name="fill"/></rng:optional>
-        <rng:optional><rng:attribute name="help"/></rng:optional>
-        <rng:optional><rng:attribute name="width"/></rng:optional>
-        <rng:optional><rng:attribute name="wrap"/></rng:optional>
-        <rng:optional><rng:attribute name="name"/></rng:optional>
-        <rng:optional>
-            <!-- @for: allows to explicitely link a label to a field -->
-            <rng:attribute name="for"/>
-        </rng:optional>
-        <rng:zeroOrMore>
-            <rng:choice>
-                <rng:text/>
-                <rng:ref name="field"/>
-                <rng:ref name="renamed_field"/>
-                <rng:ref name="group"/>
-                <rng:ref name="button"/>
-                <rng:ref name="label" />
-                <rng:ref name="renamed_label"/>
-                <rng:ref name="separator"/>
-                <rng:ref name="image"/>
-                <rng:ref name="filter"/>
-                <rng:ref name="html"/>
-                <rng:element name="newline"><rng:empty/></rng:element>
-            </rng:choice>
-        </rng:zeroOrMore>
-    </rng:define>
-
     <rng:define name="label">
         <rng:element name="label">
-            <rng:ref name="labelContent"></rng:ref>
-        </rng:element>
-    </rng:define>
-
-    <rng:define name="renamed_label">
-        <rng:element name="renamed_label">
-            <rng:ref name="labelContent"></rng:ref>
+            <rng:ref name="overload"/>
+            <rng:ref name="access_rights"/>
+            <rng:ref name="modifiable"/>
+            <rng:optional><rng:attribute name="invisible"/></rng:optional>
+            <rng:optional><rng:attribute name="align"/></rng:optional>
+            <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:optional><rng:attribute name="fill"/></rng:optional>
+            <rng:optional><rng:attribute name="help"/></rng:optional>
+            <rng:optional><rng:attribute name="width"/></rng:optional>
+            <rng:optional><rng:attribute name="wrap"/></rng:optional>
+            <rng:optional><rng:attribute name="name"/></rng:optional>
+            <rng:optional>
+                <!-- @for: allows to explicitely link a label to a field -->
+                <rng:attribute name="for"/>
+            </rng:optional>
+            <rng:zeroOrMore>
+                <rng:choice>
+                    <rng:text/>
+                    <rng:ref name="field"/>
+                    <rng:ref name="group"/>
+                    <rng:ref name="button"/>
+                    <rng:ref name="label" />
+                    <rng:ref name="separator"/>
+                    <rng:ref name="image"/>
+                    <rng:ref name="filter"/>
+                    <rng:ref name="html"/>
+                    <rng:element name="newline"><rng:empty/></rng:element>
+                </rng:choice>
+            </rng:zeroOrMore>
         </rng:element>
     </rng:define>
 
@@ -175,9 +161,7 @@
                     <rng:ref name="separator"/>
                     <rng:ref name="button"/>
                     <rng:ref name="field"/>
-                    <rng:ref name="renamed_field"/>
                     <rng:ref name="label" />
-                    <rng:ref name="renamed_label"/>
                     <rng:ref name="group" />
                     <rng:ref name="filter"/>
                     <rng:ref name="html"/>
@@ -206,9 +190,7 @@
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="field"/>
-                    <rng:ref name="renamed_field"/>
                     <rng:ref name="label"/>
-                    <rng:ref name="renamed_label"/>
                     <rng:ref name="separator"/>
                     <rng:ref name="xpath"/>
                     <rng:ref name="button"/>
@@ -221,96 +203,83 @@
         </rng:element>
     </rng:define>
 
-    <rng:define name="fieldContent">
-        <rng:attribute name="name" />
-        <rng:ref name="overload"/>
-        <rng:ref name="access_rights"/>
-        <rng:ref name="modifiable"/>
-        <rng:optional><rng:attribute name="domain_filter"/></rng:optional>
-        <rng:optional><rng:attribute name="attrs"/></rng:optional>
-        <rng:optional><rng:attribute name="class"/></rng:optional>
-        <rng:optional><rng:attribute name="string"/></rng:optional>
-        <rng:optional><rng:attribute name="completion"/></rng:optional>
-        <rng:optional><rng:attribute name="width"/></rng:optional>
-        <rng:optional><rng:attribute name="type"/></rng:optional>
-        <rng:optional><rng:attribute name="ref"/></rng:optional>
-        <rng:optional><rng:attribute name="eval"/></rng:optional>
-        <rng:optional><rng:attribute name="search"/></rng:optional>
-        <rng:optional><rng:attribute name="model"/></rng:optional>
-        <rng:optional><rng:attribute name="use"/></rng:optional>
-        <rng:optional><rng:attribute name="on_change"/></rng:optional>
-        <rng:optional><rng:attribute name="domain"/></rng:optional>
-        <rng:optional><rng:attribute name="filter_domain"/></rng:optional>
-        <rng:optional><rng:attribute name="invisible"/></rng:optional>
-        <rng:optional><rng:attribute name="password"/></rng:optional>
-        <rng:optional><rng:attribute name="comparator"/></rng:optional>
-        <rng:optional><rng:attribute name="sum"/></rng:optional>
-        <rng:optional><rng:attribute name="bold"/></rng:optional>
-        <rng:optional><rng:attribute name="avg"/></rng:optional>
-        <rng:optional><rng:attribute name="select"/></rng:optional>
-        <rng:optional><rng:attribute name="group"/></rng:optional>
-        <rng:optional><rng:attribute name="studio_groups"/></rng:optional>
-        <rng:optional><rng:attribute name="operator"/></rng:optional>
-        <rng:optional><rng:attribute name="colspan"/></rng:optional>
-        <rng:optional><rng:attribute name="nolabel"/></rng:optional>
-        <rng:optional><rng:attribute name="required"/></rng:optional>
-        <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="context"/></rng:optional>
-        <rng:optional><rng:attribute name="states"/></rng:optional>
-        <rng:optional><rng:attribute name="digits"/></rng:optional>
-        <rng:optional><rng:attribute name="icon"/></rng:optional>
-        <rng:optional><rng:attribute name="mode"/></rng:optional>
-        <rng:optional><rng:attribute name="img_width"/></rng:optional>
-        <rng:optional><rng:attribute name="img_height"/></rng:optional>
-        <rng:optional><rng:attribute name="size"/></rng:optional>
-        <rng:optional><rng:attribute name="filename"/></rng:optional>
-        <rng:optional><rng:attribute name="height"/></rng:optional>
-        <rng:optional><rng:attribute name="rowspan"/></rng:optional>
-        <rng:optional><rng:attribute name="align"/></rng:optional>
-        <rng:optional><rng:attribute name="selection"/></rng:optional>
-        <rng:optional><rng:attribute name="default_focus"/></rng:optional>
-        <rng:optional><rng:attribute name="filters"/></rng:optional>
-        <rng:optional><rng:attribute name="statusbar_visible"/></rng:optional>
-        <rng:optional><rng:attribute name="can_create" /></rng:optional>
-        <rng:optional><rng:attribute name="can_write" /></rng:optional>
-        <rng:optional><rng:attribute name="interval" /></rng:optional>
-        <rng:optional><rng:attribute name="avatar_field" /></rng:optional>
-        <rng:optional><rng:attribute name="write_model" /></rng:optional>
-        <rng:optional><rng:attribute name="write_field" /></rng:optional>
-        <!-- Widget *static* options defined as an arbitrary JSON dict, with
-             widget-dependent parameters. To be ignored if widget/client does
-             not support them. -->
-        <rng:optional><rng:attribute name="options"/></rng:optional>
-        <rng:optional><rng:attribute name="placeholder"/></rng:optional>
-        <rng:zeroOrMore>
-            <rng:choice>
-                <rng:ref name="data"/>
-                <rng:ref name="field"/>
-                <rng:ref name="renamed_field"/>
-                <rng:ref name="label"/>
-                <rng:ref name="renamed_label"/>
-                <rng:ref name="separator"/>
-                <rng:ref name="xpath"/>
-                <rng:ref name="button"/>
-                <rng:ref name="group"/>
-                <rng:ref name="filter"/>
-                <rng:ref name="html"/>
-                <rng:element name="newline"><rng:empty/></rng:element>
-            </rng:choice>
-        </rng:zeroOrMore>
-    </rng:define>
-
     <rng:define name="field">
         <rng:element name="field">
-            <rng:ref name="fieldContent"></rng:ref>
-        </rng:element>
-    </rng:define>
-
-    <rng:define name="renamed_field">
-        <rng:element name="renamed_field">
-            <rng:ref name="fieldContent"></rng:ref>
+            <rng:attribute name="name" />
+            <rng:ref name="overload"/>
+            <rng:ref name="access_rights"/>
+            <rng:ref name="modifiable"/>
+            <rng:optional><rng:attribute name="domain_filter"/></rng:optional>
+            <rng:optional><rng:attribute name="attrs"/></rng:optional>
+            <rng:optional><rng:attribute name="class"/></rng:optional>
+            <rng:optional><rng:attribute name="string"/></rng:optional>
+            <rng:optional><rng:attribute name="completion"/></rng:optional>
+            <rng:optional><rng:attribute name="width"/></rng:optional>
+            <rng:optional><rng:attribute name="type"/></rng:optional>
+            <rng:optional><rng:attribute name="ref"/></rng:optional>
+            <rng:optional><rng:attribute name="eval"/></rng:optional>
+            <rng:optional><rng:attribute name="search"/></rng:optional>
+            <rng:optional><rng:attribute name="model"/></rng:optional>
+            <rng:optional><rng:attribute name="use"/></rng:optional>
+            <rng:optional><rng:attribute name="on_change"/></rng:optional>
+            <rng:optional><rng:attribute name="domain"/></rng:optional>
+            <rng:optional><rng:attribute name="filter_domain"/></rng:optional>
+            <rng:optional><rng:attribute name="invisible"/></rng:optional>
+            <rng:optional><rng:attribute name="password"/></rng:optional>
+            <rng:optional><rng:attribute name="comparator"/></rng:optional>
+            <rng:optional><rng:attribute name="sum"/></rng:optional>
+            <rng:optional><rng:attribute name="bold"/></rng:optional>
+            <rng:optional><rng:attribute name="avg"/></rng:optional>
+            <rng:optional><rng:attribute name="select"/></rng:optional>
+            <rng:optional><rng:attribute name="group"/></rng:optional>
+            <rng:optional><rng:attribute name="operator"/></rng:optional>
+            <rng:optional><rng:attribute name="colspan"/></rng:optional>
+            <rng:optional><rng:attribute name="nolabel"/></rng:optional>
+            <rng:optional><rng:attribute name="required"/></rng:optional>
+            <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="context"/></rng:optional>
+            <rng:optional><rng:attribute name="states"/></rng:optional>
+            <rng:optional><rng:attribute name="digits"/></rng:optional>
+            <rng:optional><rng:attribute name="icon"/></rng:optional>
+            <rng:optional><rng:attribute name="mode"/></rng:optional>
+            <rng:optional><rng:attribute name="img_width"/></rng:optional>
+            <rng:optional><rng:attribute name="img_height"/></rng:optional>
+            <rng:optional><rng:attribute name="size"/></rng:optional>
+            <rng:optional><rng:attribute name="filename"/></rng:optional>
+            <rng:optional><rng:attribute name="height"/></rng:optional>
+            <rng:optional><rng:attribute name="rowspan"/></rng:optional>
+            <rng:optional><rng:attribute name="align"/></rng:optional>
+            <rng:optional><rng:attribute name="selection"/></rng:optional>
+            <rng:optional><rng:attribute name="default_focus"/></rng:optional>
+            <rng:optional><rng:attribute name="filters"/></rng:optional>
+            <rng:optional><rng:attribute name="statusbar_visible"/></rng:optional>
+            <rng:optional><rng:attribute name="can_create" /></rng:optional>
+            <rng:optional><rng:attribute name="can_write" /></rng:optional>
+            <rng:optional><rng:attribute name="interval" /></rng:optional>
+            <rng:optional><rng:attribute name="avatar_field" /></rng:optional>
+            <rng:optional><rng:attribute name="write_model" /></rng:optional>
+            <rng:optional><rng:attribute name="write_field" /></rng:optional>
+            <!-- Widget *static* options defined as an arbitrary JSON dict, with
+                 widget-dependent parameters. To be ignored if widget/client does
+                 not support them. -->
+            <rng:optional><rng:attribute name="options"/></rng:optional>
+            <rng:optional><rng:attribute name="placeholder"/></rng:optional>
+            <rng:zeroOrMore>
+                <rng:choice>
+                    <rng:ref name="data"/>
+                    <rng:ref name="field"/>
+                    <rng:ref name="label"/>
+                    <rng:ref name="separator"/>
+                    <rng:ref name="xpath"/>
+                    <rng:ref name="button"/>
+                    <rng:ref name="group"/>
+                    <rng:ref name="filter"/>
+                    <rng:ref name="html"/>
+                    <rng:element name="newline"><rng:empty/></rng:element>
+                </rng:choice>
+            </rng:zeroOrMore>
         </rng:element>
     </rng:define>
 
@@ -333,7 +302,6 @@
             <rng:optional><rng:attribute name="invisible"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
-                <rng:ref name="renamed_field"/>
             </rng:zeroOrMore>
             <rng:ref name="container"/>
         </rng:element>
@@ -364,7 +332,6 @@
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="field" />
-                    <rng:ref name="renamed_field"/>
                     <rng:ref name="xpath" />
                     <rng:ref name="separator"/>
                     <rng:ref name="button"/>
@@ -399,7 +366,6 @@
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="field" />
-                    <rng:ref name="renamed_field"/>
                     <rng:ref name="xpath" />
                     <rng:ref name="separator"/>
                     <rng:ref name="button"/>
diff --git a/odoo/addons/base/rng/diagram_view.rng b/odoo/addons/base/rng/diagram_view.rng
index ebd95bcdfbf..9a1b2898727 100644
--- a/odoo/addons/base/rng/diagram_view.rng
+++ b/odoo/addons/base/rng/diagram_view.rng
@@ -14,7 +14,6 @@
             <rng:ref name="arrow"/>
             <rng:zeroOrMore>
                 <rng:ref name="label"/>
-                <rng:ref name="renamed_label"/>
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>
@@ -27,7 +26,6 @@
             <rng:optional><rng:attribute name="form_view_ref"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
-                <rng:ref name="renamed_field"/>
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>
@@ -41,7 +39,6 @@
             <rng:optional><rng:attribute name="label"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
-                <rng:ref name="renamed_field"/>
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>
diff --git a/odoo/addons/base/rng/graph_view.rng b/odoo/addons/base/rng/graph_view.rng
index 37d4f44128e..577917e5da7 100644
--- a/odoo/addons/base/rng/graph_view.rng
+++ b/odoo/addons/base/rng/graph_view.rng
@@ -24,7 +24,6 @@
             <rng:optional><rng:attribute name="interval"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
-                <rng:ref name="renamed_field"/>
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>
diff --git a/odoo/addons/base/rng/pivot_view.rng b/odoo/addons/base/rng/pivot_view.rng
index 77a02b2c495..98daf5d4b26 100644
--- a/odoo/addons/base/rng/pivot_view.rng
+++ b/odoo/addons/base/rng/pivot_view.rng
@@ -14,7 +14,6 @@
             <rng:optional><rng:attribute name="disable_linking"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
-                <rng:ref name="renamed_field"/>
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>
diff --git a/odoo/addons/base/rng/search_view.rng b/odoo/addons/base/rng/search_view.rng
index 9f0b5cded1c..74dc4c89abd 100644
--- a/odoo/addons/base/rng/search_view.rng
+++ b/odoo/addons/base/rng/search_view.rng
@@ -13,7 +13,6 @@
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="field"/>
-                    <rng:ref name="renamed_field"/>
                     <rng:ref name="group"/>
                     <rng:ref name="separator"/>
                     <rng:ref name="filter"/>
diff --git a/odoo/addons/base/rng/tree_view.rng b/odoo/addons/base/rng/tree_view.rng
index 033002d59d6..1dec8e9ab11 100644
--- a/odoo/addons/base/rng/tree_view.rng
+++ b/odoo/addons/base/rng/tree_view.rng
@@ -53,7 +53,6 @@
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="field"/>
-                    <rng:ref name="renamed_field"/>
                     <rng:ref name="separator"/>
                     <rng:ref name="tree"/>
                     <rng:ref name="group"/>
diff --git a/odoo/tools/view_validation.py b/odoo/tools/view_validation.py
index 47e7a44f601..1ffdd43e58b 100644
--- a/odoo/tools/view_validation.py
+++ b/odoo/tools/view_validation.py
@@ -75,7 +75,7 @@ def valid_field_in_graph(arch):
 def valid_field_in_tree(arch):
     """ Children of ``tree`` view must be ``field`` or ``button``."""
     return all(
-        child.tag in ('field', 'button', 'renamed_field')
+        child.tag in ('field', 'button')
         for child in arch.xpath('/tree/*')
     )