[IMP] sale_elaboration: Based report view elaborations in stock moves instead of sale.order.lines

TT51619

Author: sergio-teruel

sale_elaboration/README.rst

@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 ================
 Sale Elaboration
 ================
@@ -17,7 +13,7 @@ Sale Elaboration
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
     :alt: Production/Stable
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github

sale_elaboration/__manifest__.py

@@ -20,7 +20,7 @@
         "views/sale_elaboration_profile_views.xml",
         "views/sale_elaboration_views.xml",
         "views/sale_order_views.xml",
-        "views/sale_elaboration_report_views.xml",
+        "views/stock_move_report_views.xml",
         "views/stock_move_line_views.xml",
         "views/stock_picking_views.xml",
         "reports/report_base.xml",

sale_elaboration/models/sale_order.py

@@ -1,8 +1,7 @@
 # Copyright 2018 Tecnativa - Sergio Teruel
 # Copyright 2019 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from odoo import _, api, fields, models
-from odoo.exceptions import UserError
+from odoo import api, fields, models
 
 
 def _execute_onchanges(records, field_name):
@@ -54,11 +53,6 @@ class SaleOrderLine(models.Model):
     elaboration_price_unit = fields.Float(
         "Elab. Price", compute="_compute_elaboration_price_unit", store=True
     )
-    is_prepared = fields.Boolean(
-        compute=lambda self: None,
-        search="_search_is_prepared",
-        help=("Dummy field to be able to find prepared lines"),
-    )
 
     @api.depends("product_id")
     def _compute_elaboration_profile_id(self):
@@ -97,30 +91,3 @@ def _prepare_invoice_line(self, **optional_values):
         if self.is_elaboration:
             vals["name"] = f"{self.order_id.name} - {self.name}"
         return vals
-
-    def _search_is_prepared(self, operator, value):
-        if operator != "=":
-            raise UserError(
-                _("Unsupported operator %s for searching on is_prepared") % (operator,)
-            )
-        moves = self.env["stock.move"].search(
-            [
-                (
-                    "state",
-                    "not in" if value else "in",
-                    [
-                        "draft",
-                        "waiting",
-                        "confirmed",
-                        "partially_available",
-                        "assigned",
-                    ],
-                ),
-                (
-                    "location_dest_id",
-                    "=",
-                    self.env.ref("stock.stock_location_customers").id,
-                ),
-            ]
-        )
-        return [("move_ids", "in", moves.ids)]

sale_elaboration/models/stock_move.py

@@ -8,6 +8,26 @@ class StockMove(models.Model):
     _inherit = ["stock.move", "product.elaboration.mixin"]
     _name = "stock.move"
 
+    # Helper fields to display elaborations in tree view
+    sale_id = fields.Many2one(
+        comodel_name="sale.order", compute="_compute_sale_related_data"
+    )
+    salesman_id = fields.Many2one(
+        comodel_name="res.users", compute="_compute_sale_related_data"
+    )
+    order_date = fields.Datetime(compute="_compute_sale_related_data")
+    sequence_code = fields.Char(compute="_compute_sale_related_data")
+
+    def _compute_sale_related_data(self):
+        # Get all chained moves to get sale line
+        for move in self:
+            moves = self.browse(list(self._rollup_move_dests({move.id})))
+            move_sale = moves.filtered("sale_line_id")[:1]
+            move.sale_id = move_sale.sale_line_id.order_id
+            move.salesman_id = move_sale.sale_line_id.order_id.user_id
+            move.order_date = move_sale.sale_line_id.date_order
+            move.sequence_code = move.picking_type_id.sequence_code
+
     @api.model
     def _prepare_merge_moves_distinct_fields(self):
         """Don't merge moves with distinct elaborations"""

sale_elaboration/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>Sale Elaboration</title>
 <style type="text/css">
 
 /*
@@ -360,21 +360,16 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="sale-elaboration">
+<h1 class="title">Sale Elaboration</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="sale-elaboration">
-<h1>Sale Elaboration</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:adeb8d361b6078141fbb5f50b50c5369061c8303bf88ba266a5e7a09527a59cf
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/sale-workflow/tree/18.0/sale_elaboration"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-workflow-18-0/sale-workflow-18-0-sale_elaboration"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/sale-workflow&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/sale-workflow/tree/18.0/sale_elaboration"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-workflow-18-0/sale-workflow-18-0-sale_elaboration"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/sale-workflow&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of sales orders to allow to set an
 elaboration on lines that will add an extra order line with an
 elaboration product linked to it when the delivery order is validated.</p>
@@ -401,13 +396,13 @@ <h1>Sale Elaboration</h1>
 </ul>
 </div>
 <div class="section" id="use-cases-context">
-<h2><a class="toc-backref" href="#toc-entry-1">Use Cases / Context</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Use Cases / Context</a></h1>
 <p>This module was created to meet the need of providing the customer with
 products that are not transformed into something new, but rather require
 a simple preparation process. Example: Scaling a fish</p>
 </div>
 <div class="section" id="configuration">
-<h2><a class="toc-backref" href="#toc-entry-2">Configuration</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
 <p>To configure this module you need to:</p>
 <ol class="arabic simple">
 <li>Go to <em>Sale &gt; Configuration &gt; Elaborations &gt; Sale Elaboration</em>.</li>
@@ -439,7 +434,7 @@ <h2><a class="toc-backref" href="#toc-entry-2">Configuration</a></h2>
 </ol>
 </div>
 <div class="section" id="usage">
-<h2><a class="toc-backref" href="#toc-entry-3">Usage</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1>
 <ol class="arabic simple">
 <li>Go to <em>Sale &gt; Quotations</em>.</li>
 <li>Create a sales order.</li>
@@ -455,23 +450,23 @@ <h2><a class="toc-backref" href="#toc-entry-3">Usage</a></h2>
 </ol>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/sale-workflow/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_elaboration%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-5">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-5">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-6">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
 <ul class="simple">
 <li>Tecnativa</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-7">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <ul class="simple">
 <li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
 <li>Sergio Teruel</li>
@@ -485,7 +480,7 @@ <h3><a class="toc-backref" href="#toc-entry-7">Contributors</a></h3>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -500,6 +495,5 @@ <h3><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>

sale_elaboration/views/sale_elaboration_report_views.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2024 Tecnativa - Sergio Teruel
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="report_stock_move_elaboration_view_tree" model="ir.ui.view">
+        <field name="name">Elaborations</field>
+        <field name="model">stock.move</field>
+        <field name="arch" type="xml">
+            <list create="false" default_order="date desc">
+                <field name="sequence_code" />
+                <field name="order_date" />
+                <field name="date" widget="date" />
+                <field name="date_deadline" optional="hide" />
+                <field name="sale_id" />
+                <field name="salesman_id" />
+                <field name="partner_id" />
+                <field name="product_id" />
+                <field name="elaboration_ids" widget="many2many_tags" />
+                <field name="elaboration_note" />
+                <field name="product_uom_qty" />
+                <field name="product_uom" />
+                <field
+                    name="state"
+                    widget="badge"
+                    decoration-success="state == 'done'"
+                    decoration-info="state not in ('done', 'cancel')"
+                />
+            </list>
+        </field>
+    </record>
+    <record id="view_move_search" model="ir.ui.view">
+        <field name="model">stock.move</field>
+        <field name="inherit_id" ref="stock.view_move_search" />
+        <field name="arch" type="xml">
+            <field name="product_id" position="after">
+                <separator />
+                <field
+                    name="date"
+                    filter_domain="[('date','&gt;=', self)]"
+                    string="After Date"
+                />
+                <field name="elaboration_ids" />
+                <field name="elaboration_note" />
+                <filter
+                    string="Is Elaboration"
+                    domain="['|', ('elaboration_ids', '!=', False), ('elaboration_note', '!=', '')]"
+                    name="is_elaboration"
+                />
+                <separator />
+            </field>
+            <group position="inside">
+                <filter
+                    string="Elaboration"
+                    context="{'group_by':'elaboration_ids'}"
+                    name="elaboration_grouped"
+                />
+            </group>
+        </field>
+    </record>
+    <record id="stock_move_elaboration_report_action" model="ir.actions.act_window">
+        <field name="name">Elaborations Report</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">stock.move</field>
+        <field name="view_mode">list</field>
+        <field
+            name="domain"
+        >[('state', 'not in', ['done', 'cancel']), ('origin_returned_move_id', '=', False)]</field>
+        <field name="context">{'search_default_is_elaboration':1}</field>
+        <field name="search_view_id" ref="view_move_search" />
+        <field
+            name="view_ids"
+            eval="[(5, 0, 0),
+                (0, 0, {'view_mode': 'list', 'view_id': ref('sale_elaboration.report_stock_move_elaboration_view_tree')}),
+                (0, 0, {'view_mode': 'pivot', 'view_id': ref('stock.view_move_pivot')}),
+                ]"
+        />
+    </record>
+    <menuitem
+        id="menu_sale_stock_move_elaboration_report"
+        action="stock_move_elaboration_report_action"
+        parent="sale.menu_sale_report"
+        sequence="70"
+    />
+    <!--  Allow inventory users to access to elaboration report  -->
+    <menuitem
+        id="menu_stock_sale_stock_move_elaboration_report"
+        action="stock_move_elaboration_report_action"
+        parent="stock.menu_warehouse_report"
+        sequence="160"
+    />
+</odoo>