From 3aa8c6a5fa89e6f28361668074b8242d93bdfbd9 Mon Sep 17 00:00:00 2001
From: Lois Rilo <lois.rilo@forgeflow.com>
Date: Thu, 16 Mar 2023 11:12:39 +0100
Subject: [PATCH 1/2] [IMP] stock_demand_estimate: enhance views

* Add a graph view.
* Add handy filters: (not) expired; group by date, location and/or product.
* Relabel `product_qty` as "Real Quantity" was really confusing.
---
 .../models/stock_demand_estimate.py           |  2 +-
 .../views/stock_demand_estimate_view.xml      | 48 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/stock_demand_estimate/models/stock_demand_estimate.py b/stock_demand_estimate/models/stock_demand_estimate.py
index 5f0af2d58..b7b056bb2 100644
--- a/stock_demand_estimate/models/stock_demand_estimate.py
+++ b/stock_demand_estimate/models/stock_demand_estimate.py
@@ -33,7 +33,7 @@ class StockDemandEstimate(models.Model):
     )
     product_uom_qty = fields.Float(string="Quantity", digits="Product Unit of Measure")
     product_qty = fields.Float(
-        "Real Quantity",
+        string="Quantity (Product UoM)",
         compute="_compute_product_quantity",
         inverse="_inverse_product_quantity",
         digits=0,
diff --git a/stock_demand_estimate/views/stock_demand_estimate_view.xml b/stock_demand_estimate/views/stock_demand_estimate_view.xml
index b9b01334b..c5d543886 100644
--- a/stock_demand_estimate/views/stock_demand_estimate_view.xml
+++ b/stock_demand_estimate/views/stock_demand_estimate_view.xml
@@ -56,6 +56,19 @@
             </pivot>
         </field>
     </record>
+
+    <record id="stock_demand_estimate_view_graph" model="ir.ui.view">
+        <field name="name">stock.demand.estimate.graph</field>
+        <field name="model">stock.demand.estimate</field>
+        <field name="arch" type="xml">
+            <graph type="bar" stacked="True">
+                <field name="product_qty" type="measure" />
+                <field name="date_from" />
+                <field name="product_id" />
+            </graph>
+        </field>
+    </record>
+
     <record id="stock_demand_estimate_view_search" model="ir.ui.view">
         <field name="name">stock.demand.estimate.search</field>
         <field name="model">stock.demand.estimate</field>
@@ -63,6 +76,38 @@
             <search string="Search Stock Demand Estimates">
                 <field name="product_id" />
                 <field name="location_id" />
+                <separator />
+                <filter
+                    name="expired"
+                    string="Expired"
+                    domain="[('date_to', '&lt;', context_today().strftime('%Y-%m-%d'))]"
+                />
+                <filter
+                    name="not_expired"
+                    string="Not Expired"
+                    domain="['|', ('date_to', '=', False), ('date_to', '&gt;', context_today().strftime('%Y-%m-%d'))]"
+                />
+                <separator />
+                <group expand="0" string="Group By">
+                    <filter
+                        string="Product"
+                        name="groupby_product"
+                        domain="[]"
+                        context="{'group_by':'product_id'}"
+                    />
+                    <filter
+                        string="Location"
+                        name="groupby_location"
+                        domain="[]"
+                        context="{'group_by':'location_id'}"
+                    />
+                    <filter
+                        string="Date (From)"
+                        name="groupby_date_from"
+                        domain="[]"
+                        context="{'group_by':'date_from'}"
+                    />
+                </group>
             </search>
         </field>
     </record>
@@ -70,8 +115,9 @@
         <field name="name">Stock Demand Estimates</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">stock.demand.estimate</field>
-        <field name="view_mode">tree,form,pivot</field>
+        <field name="view_mode">tree,form,pivot,graph</field>
         <field name="search_view_id" ref="stock_demand_estimate_view_search" />
+        <field name="context">{"search_default_not_expired": 1}</field>
     </record>
     <menuitem
         id="stock_demand_planning_menu"

From 160f7ed259bb9a347da19fcc5804c24e7ec8a1c4 Mon Sep 17 00:00:00 2001
From: Lois Rilo <lois.rilo@forgeflow.com>
Date: Thu, 16 Mar 2023 17:55:48 +0100
Subject: [PATCH 2/2] [FIX] stock_demand_estimate_matrix: remove action
 extension

no need to modify action, once the tree view is set as editable it
will work as itended, no need to remove form from the view modes.
---
 .../views/stock_demand_estimate_view.xml                   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/stock_demand_estimate_matrix/views/stock_demand_estimate_view.xml b/stock_demand_estimate_matrix/views/stock_demand_estimate_view.xml
index d74cad674..4dc5d10f7 100644
--- a/stock_demand_estimate_matrix/views/stock_demand_estimate_view.xml
+++ b/stock_demand_estimate_matrix/views/stock_demand_estimate_view.xml
@@ -43,10 +43,5 @@
             </field>
         </field>
     </record>
-    <record
-        id="stock_demand_estimate.stock_demand_estimate_action"
-        model="ir.actions.act_window"
-    >
-        <field name="view_mode">tree,pivot</field>
-    </record>
+
 </odoo>