[18.0][MIG] account_reporting_product_template: Migration to 18.0

Author: alfredoavanzosc

account_reporting_product_template/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "Product template in the invoices analysis view",
-    "version": "16.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Account",
     "license": "AGPL-3",
     "author": "AvanzOSC",

account_reporting_product_template/pyproject.toml

@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from odoo import api, fields, models
+from odoo.tools import SQL
 
 
 class AccountInvoiceReport(models.Model):
@@ -14,14 +15,10 @@ class AccountInvoiceReport(models.Model):
 
     @api.model
     def _select(self):
-        select_str = super()._select()
-        select_str += """
-            , template.id as product_tmpl_id
+        return SQL(
             """
-        return select_str
-
-    @api.model
-    def _group_by(self):
-        group_by_str = super()._group_by()
-        group_by_str += ", template.id"
-        return group_by_str
+            %s,
+            product.product_tmpl_id AS product_tmpl_id 
+        """,
+            super()._select(),
+        )

account_reporting_product_template/reports/account_invoice_report.py

@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-  <record id="account_invoice_report_view_search" model="ir.ui.view">
-    <field name="inherit_id" ref="account.view_account_invoice_report_search" />
-    <field name="model">account.invoice.report</field>
-    <field name="arch" type="xml">
-      <field name="product_id" position="before">
-        <field name="product_tmpl_id" />
-      </field>
-      <filter name="category_product" position="after">
-        <filter
+    <record id="account_invoice_report_view_search" model="ir.ui.view">
+        <field name="inherit_id" ref="account.view_account_invoice_report_search" />
+        <field name="model">account.invoice.report</field>
+        <field name="arch" type="xml">
+            <field name="product_id" position="before">
+                <field name="product_tmpl_id" />
+            </field>
+            <filter name="category_product" position="after">
+                <filter
           string="Product Template"
           name="product_template"
           context="{'group_by':'product_tmpl_id'}"
         />
-        <filter string="Product" name="product" context="{'group_by':'product_id'}" />
-      </filter>
-    </field>
-  </record>
+                <filter
+          string="Product"
+          name="product"
+          context="{'group_by':'product_id'}"
+        />
+            </filter>
+        </field>
+    </record>
 </odoo>