From a517fe67a8ae906f61294350ac4028ca283caeca Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Thu, 18 Jan 2024 13:22:46 +0000
Subject: [PATCH] account_usability_akretion: update account.invoice.report
 views

---
 account_usability_akretion/__manifest__.py    |  2 +-
 .../views/account_invoice_report.xml          | 57 ++++++-------------
 2 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/account_usability_akretion/__manifest__.py b/account_usability_akretion/__manifest__.py
index 187bdce..429a51f 100644
--- a/account_usability_akretion/__manifest__.py
+++ b/account_usability_akretion/__manifest__.py
@@ -18,7 +18,7 @@
         'views/account_account.xml',
         'views/account_group.xml',
 #        'views/account_bank_statement.xml',
-#        'views/account_invoice_report.xml',
+        'views/account_invoice_report.xml',
         'views/account_journal.xml',
         'views/account_move.xml',
         'views/account_menu.xml',
diff --git a/account_usability_akretion/views/account_invoice_report.xml b/account_usability_akretion/views/account_invoice_report.xml
index 7a4d7be..d57fc43 100644
--- a/account_usability_akretion/views/account_invoice_report.xml
+++ b/account_usability_akretion/views/account_invoice_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2018-2020 Akretion (http://www.akretion.com/)
+  Copyright 2018-2024 Akretion (http://www.akretion.com/)
   @author: Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
@@ -8,56 +8,31 @@
 <odoo>
 
 
-<record id="account_invoice_report_tree" model="ir.ui.view">
+<record id="account_invoice_report_view_tree" model="ir.ui.view">
     <field name="name">usability.account.invoice.report.tree</field>
     <field name="model">account.invoice.report</field>
+    <field name="inherit_id" ref="account.account_invoice_report_view_tree"/>
     <field name="arch" type="xml">
-        <tree string="Invoices Analysis">
-            <field name="move_id"/>
-            <field name="journal_id" optional="hide"/>
-            <field name="company_id" optional="hide" groups="base.group_multi_company"/>
-            <field name="invoice_date"/>
-            <field name="invoice_date_due"/>
-            <field name="move_type"/>
-            <field name="commercial_partner_id"/>
-            <field name="partner_id" optional="hide"/>
-            <field name="country_id" optional="hide"/>
+        <field name="partner_id" position="after">
+	   <field name="commercial_partner_id" optional="hide"/>
+            	<field name="country_id" optional="hide"/>
             <field name="industry_id" optional="hide"/>
-            <field name="invoice_user_id"/>
             <field name="fiscal_position_id" optional="hide"/>
-            <field name="product_id"/>
-            <field name="product_categ_id" optional="hide"/>
-            <field name="account_id" optional="hide"/>
-            <field name="analytic_account_id" optional="hide" groups="analytic.group_analytic_accounting"/>
-            <field name="quantity" sum="1"/>
-            <field name="product_uom_id" groups="uom.group_uom"/>
-            <field name="price_subtotal" sum="1"/>
-            <field name="state"/>
-            <field name="payment_state" optional="hide"/>
-        </tree>
+	</field>
+        <field name="quantity" position="after">
+		<field name="product_uom_id" groups="uom.group_uom" optional="hide"/>
+	</field>
     </field>
 </record>
 
-<record id="account.action_account_invoice_report_all_supp" model="ir.actions.act_window">
-    <field name="context">{'search_default_current': 1, 'search_default_supplier': 1, 'group_by': ['invoice_date']}</field>  <!-- Remove group_by_no_leaf, which breaks tree view -->
-    <field name="view_mode">pivot,graph</field>
-</record>
-
-<record id="account.action_account_invoice_report_all" model="ir.actions.act_window">
-    <field name="context">{'search_default_current': 1, 'search_default_customer': 1, 'group_by': ['invoice_date']}</field>  <!-- Remove group_by_no_leaf, which breaks tree view -->
-    <field name="view_mode">pivot,graph</field>
-</record>
-
-<record id="view_account_invoice_report_pivot" model="ir.ui.view">
-    <field name="name">usability.account.invoice.report</field>
+<record id="view_account_invoice_report_search" model="ir.ui.view">
     <field name="model">account.invoice.report</field>
-    <field name="inherit_id" ref="account.view_account_invoice_report_pivot"/>
+    <field name="inherit_id" ref="account.view_account_invoice_report_search"/>
     <field name="arch" type="xml">
-        <pivot position="attributes">
-            <attribute name="disable_linking"></attribute>
-        </pivot>
-    </field>
+	<filter name="category_product" position="after">
+	    <filter string="Product" name="product_groupby" context="{'group_by': 'product_id', 'residual_invisible':True}"/>
+       </filter>
+   </field>
 </record>
 
-
 </odoo>