From addeae990f5986934ee4e0ae1a2391302d62f584 Mon Sep 17 00:00:00 2001
From: David Monjoie <dmo@odoo.com>
Date: Mon, 18 Feb 2019 14:37:28 +0000
Subject: [PATCH] [IMP] base,doc: add scales attribute to gantt view

closes odoo/odoo#31210
---
 doc/reference/views.rst             | 3 +++
 odoo/addons/base/rng/gantt_view.rng | 1 +
 2 files changed, 4 insertions(+)

diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index e4137c12d3b..7e22a3b4834 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -1355,6 +1355,9 @@ take the following attributes:
   * ``week``
   * ``month``
   * ``year``
+``scales``
+  comma-separated list of allowed scales for this view. By default, all scales
+  are allowed. For possible scale values to use in this list, see ``default_scale``.
 
 ``templates``
   defines the :ref:`reference/qweb` template ``gantt-popover`` which is used
diff --git a/odoo/addons/base/rng/gantt_view.rng b/odoo/addons/base/rng/gantt_view.rng
index 4e8c7810584..7d9b2dcc00c 100644
--- a/odoo/addons/base/rng/gantt_view.rng
+++ b/odoo/addons/base/rng/gantt_view.rng
@@ -23,6 +23,7 @@
             <rng:optional><rng:attribute name="total_row"/></rng:optional>
             <rng:optional><rng:attribute name="collapse_first_level"/></rng:optional>
             <rng:optional><rng:attribute name="offset"/></rng:optional>
+            <rng:optional><rng:attribute name="scales"/></rng:optional>
 
             <rng:optional>
                 <rng:attribute name="default_scale">