From 94959f459a66cc84a35f6a58521c8946499ff044 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Wed, 21 Nov 2018 18:15:25 +0100
Subject: [PATCH] Restore drill-through on sale and invoice reports

---
 account_usability/__init__.py                 |  1 +
 account_usability/__manifest__.py             |  1 +
 account_usability/account_invoice_report.py   | 27 ++++++++++
 .../account_invoice_report_view.xml           | 51 +++++++++++++++++++
 sale_usability/__manifest__.py                |  1 +
 sale_usability/sale_report_view.xml           | 46 +++++++++++++++++
 6 files changed, 127 insertions(+)
 create mode 100644 account_usability/account_invoice_report.py
 create mode 100644 account_usability/account_invoice_report_view.xml
 create mode 100644 sale_usability/sale_report_view.xml

diff --git a/account_usability/__init__.py b/account_usability/__init__.py
index be026e1..dcab2b0 100644
--- a/account_usability/__init__.py
+++ b/account_usability/__init__.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from . import account
+from . import account_invoice_report
 from . import partner
 from . import wizard
diff --git a/account_usability/__manifest__.py b/account_usability/__manifest__.py
index 6e19a2d..2764262 100644
--- a/account_usability/__manifest__.py
+++ b/account_usability/__manifest__.py
@@ -38,6 +38,7 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
     'data': [
         'account_view.xml',
         'account_report.xml',
+        'account_invoice_report_view.xml',
         'partner_view.xml',
         'product_view.xml',
         'wizard/account_invoice_mark_sent_view.xml',
diff --git a/account_usability/account_invoice_report.py b/account_usability/account_invoice_report.py
new file mode 100644
index 0000000..ee66730
--- /dev/null
+++ b/account_usability/account_invoice_report.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 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).
+
+from odoo import models, fields
+
+
+class AccountInvoiceReport(models.Model):
+    _inherit = 'account.invoice.report'
+
+    number = fields.Char(string="Number", readonly=True)
+
+    def _sub_select(self):
+        select_str = super(AccountInvoiceReport, self)._sub_select()
+        select_str += ", ai.number"
+        return select_str
+
+    def _select(self):
+        select_str = super(AccountInvoiceReport, self)._select()
+        select_str += ", sub.number"
+        return select_str
+
+    def _group_by(self):
+        group_by_str = super(AccountInvoiceReport, self)._group_by()
+        group_by_str += ", ai.number"
+        return group_by_str
diff --git a/account_usability/account_invoice_report_view.xml b/account_usability/account_invoice_report_view.xml
new file mode 100644
index 0000000..b0b07b3
--- /dev/null
+++ b/account_usability/account_invoice_report_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2018 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).
+-->
+
+<odoo>
+
+
+<record id="account_invoice_report_tree" model="ir.ui.view">
+    <field name="name">usability.account.invoice.report.tree</field>
+    <field name="model">account.invoice.report</field>
+    <field name="arch" type="xml">
+        <tree string="Invoices Analysis">
+            <field name="number"/>
+            <field name="date"/>
+            <field name="date_due"/>
+            <field name="type"/>
+            <field name="commercial_partner_id"/>
+            <field name="user_id"/>
+            <field name="product_id"/>
+            <field name="product_qty" sum="1"/>
+            <field name="uom_name" groups="product.group_uom"/>
+            <field name="price_total" sum="1"/>
+            <field name="state"/>
+        </tree>
+    </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, 'search_default_year': 1}</field>  <!-- Remove group_by_no_leaf, which breaks tree view -->
+</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, 'search_default_year': 1}</field>  <!-- Remove group_by_no_leaf, which breaks tree view -->
+</record>
+
+<record id="view_account_invoice_report_pivot" model="ir.ui.view">
+    <field name="name">usability.account.invoice.report</field>
+    <field name="model">account.invoice.report</field>
+    <field name="inherit_id" ref="account.view_account_invoice_report_pivot"/>
+    <field name="arch" type="xml">
+        <pivot position="attributes">
+            <attribute name="disable_linking"></attribute>
+        </pivot>
+    </field>
+</record>
+
+
+</odoo>
diff --git a/sale_usability/__manifest__.py b/sale_usability/__manifest__.py
index 4577b53..2ce74aa 100644
--- a/sale_usability/__manifest__.py
+++ b/sale_usability/__manifest__.py
@@ -26,6 +26,7 @@ This module has been written by Alexis de Lattre from Akretion
     'depends': ['sale'],
     'data': [
         'sale_view.xml',
+        'sale_report_view.xml',
         'product_view.xml',
         'security/ir.model.access.csv',
         ],
diff --git a/sale_usability/sale_report_view.xml b/sale_usability/sale_report_view.xml
new file mode 100644
index 0000000..3849bc6
--- /dev/null
+++ b/sale_usability/sale_report_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2018 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).
+-->
+
+<odoo>
+
+
+<record id="sale_report_tree" model="ir.ui.view">
+    <field name="name">usability.sale.report.tree</field>
+    <field name="model">sale.report</field>
+    <field name="arch" type="xml">
+        <tree string="Sales Analysis">
+            <field name="name"/>
+            <field name="date"/>
+            <field name="commercial_partner_id"/>
+            <field name="user_id"/>
+            <field name="product_id"/>
+            <field name="product_uom_qty" sum="1"/>
+            <field name="qty_delivered" sum="1"/>
+            <field name="qty_to_invoice" sum="1"/>
+            <field name="product_uom" groups="product.group_uom"/>
+            <field name="price_subtotal" sum="1"/>
+            <field name="state"/>
+        </tree>
+    </field>
+</record>
+
+<record id="sale.action_order_report_all" model="ir.actions.act_window">
+    <field name="context">{'search_default_Sales': 1}</field>  <!-- Remove group_by_no_leaf, which breaks tree view -->
+</record>
+
+<record id="view_order_product_pivot" model="ir.ui.view">
+    <field name="name">usability.sale.report.pivot</field>
+    <field name="model">sale.report</field>
+    <field name="inherit_id" ref="sale.view_order_product_pivot"/>
+    <field name="arch" type="xml">
+        <pivot position="attributes">
+            <attribute name="disable_linking"></attribute>
+        </pivot>
+    </field>
+</record>
+
+</odoo>