[MIG] stock_picking_report_valued_sale_mrp: Migration to 18.0

Author: Anxo82

stock_picking_report_valued_sale_mrp/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Valued picking linked with MRP Kits",
     "summary": "Allow to summarize the picking related with the selled kits",
-    "version": "16.0.1.0.0",
+    "version": "18.0.1.0.0",
     "development_status": "Beta",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-reporting",

stock_picking_report_valued_sale_mrp/models/stock_move.py

@@ -11,21 +11,20 @@ def _get_components_per_kit(self):
         rely on the matching of sale order and pickings demands, but if those
         were manually changed, it could lead to inconsistencies"""
         self.ensure_one()
+        result = 0.0
         sale_line = self.sale_line_id
-        if (
-            not sale_line
-            or not sale_line.product_id.get_components()
-            or sale_line.product_id.ids == sale_line.product_id.get_components()
-        ):
-            return 0
-        component_demand = sum(
-            sale_line.move_ids.filtered(
-                lambda x: x.product_id == self.product_id
-                and not x.origin_returned_move_id
-                and (
-                    x.state != "cancel"
-                    or (x.state == "cancel" and x.picking_id.backorder_id)
+        if sale_line:
+            product = sale_line.product_id
+
+            bom_map = self.env["mrp.bom"]._bom_find(
+                product,
+                company_id=self.company_id.id,
+            )
+            bom = bom_map.get(product)
+            if bom and bom.type == "phantom":
+                bom_line = bom.bom_line_ids.filtered(
+                    lambda line: line.product_id == self.product_id
                 )
-            ).mapped("product_uom_qty")
-        )
-        return component_demand / sale_line.product_uom_qty
+                if bom_line:
+                    result = bom_line.product_qty
+        return result

stock_picking_report_valued_sale_mrp/models/stock_move_line.py

@@ -11,7 +11,6 @@ class StockMoveLine(models.Model):
         compute="_compute_phantom_product_id",
         compute_sudo=True,
         string="Product Kit",
-        readonly=True,
     )
     phantom_line = fields.Boolean(
         compute="_compute_sale_order_line_fields",
@@ -26,12 +25,17 @@ class StockMoveLine(models.Model):
     def _compute_phantom_product_id(self):
         """Relate every line with its kit product"""
         self.phantom_product_id = False
-        for line in self.filtered(
-            lambda x: x.sale_line
-            and x.sale_line.product_id.get_components()
-            and x.sale_line.product_id.ids != x.sale_line.product_id.get_components()
-        ):
-            line.phantom_product_id = line.sale_line.product_id
+        for line in self:
+            if not line.sale_line:
+                continue
+            product = line.sale_line.product_id
+            bom_map = self.env["mrp.bom"]._bom_find(
+                product,
+                company_id=line.company_id.id,
+            )
+            bom = bom_map.get(product)
+            if bom and bom.type == "phantom":
+                line.phantom_product_id = product
 
     def _compute_sale_order_line_fields(self):
         """For kits we only want to store the value in one of the move lines to
@@ -44,7 +48,7 @@ def _compute_sale_order_line_fields(self):
         )
         for picking in pickings:
             self.filtered(
-                lambda x: x.picking_id == picking
+                lambda x, picking=picking: x.picking_id == picking
             )._compute_sale_order_line_fields_by_picking()
         return res
 
@@ -54,7 +58,9 @@ def _compute_sale_order_line_fields_by_picking(self):
         """
         kit_lines = self.filtered("phantom_product_id")
         for sale_line in kit_lines.mapped("sale_line"):
-            move_lines = kit_lines.filtered(lambda x: x.sale_line == sale_line)
+            move_lines = kit_lines.filtered(
+                lambda x, sale_line=sale_line: x.sale_line == sale_line
+            )
             # Deduce the kit quantity from the first component in the picking.
             # If the the kit is partially delivered, this could lead to an
             # unacurate value.
@@ -72,10 +78,13 @@ def _compute_sale_order_line_fields_by_picking(self):
             components_per_kit = phantom_line.move_id._get_components_per_kit()
             phantom_line_qty_done = sum(
                 move_lines.filtered(
-                    lambda x: x.product_id == phantom_line.product_id
-                ).mapped("qty_done")
+                    lambda x, phantom_line=phantom_line: x.product_id
+                    == phantom_line.product_id
+                ).mapped("quantity")
+            )
+            quantity = (
+                phantom_line_qty_done / components_per_kit if components_per_kit else 0
             )
-            quantity = phantom_line_qty_done / components_per_kit
             taxes = phantom_line.sale_tax_id.compute_all(
                 price_unit=price_unit,
                 currency=phantom_line.currency_id,
@@ -107,8 +116,8 @@ def _compute_sale_order_line_fields_by_picking(self):
                 redundant_lines.update(
                     {
                         "sale_tax_description": "",
-                        "sale_price_subtotal": 0,
-                        "sale_price_tax": 0,
-                        "sale_price_total": 0,
+                        "sale_price_subtotal": 0.0,
+                        "sale_price_tax": 0.0,
+                        "sale_price_total": 0.0,
                     }
                 )

stock_picking_report_valued_sale_mrp/report/stock_picking_report_valued.xml

@@ -1,53 +1,24 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <template
-        id="stock_report_delivery_document_inherit_mrp"
-        inherit_id="mrp.stock_report_delivery_document_inherit_mrp"
+        id="stock_report_delivery_document_disable_kits"
+        inherit_id="stock.report_delivery_document"
     >
-        <!-- disable printing of kits in a separate table -->
-        <xpath
-            expr="//table[@name='stock_move_line_table']/tbody/t[@t-set='has_kits']"
-            position="attributes"
-        >
-            <attribute name="t-value">env["stock.move.line"]</attribute>
-        </xpath>
-        <xpath
-            expr="//t[@name='no_package_move_lines']/t[@t-set='has_kits']"
-            position="attributes"
-        >
-            <attribute name="t-value">env["stock.move.line"]</attribute>
+        <!-- Disable phantom kit rendering block -->
+        <xpath expr="//t[@t-if='has_kits']" position="attributes">
+            <attribute name="t-if">False</attribute>
         </xpath>
     </template>
     <template
         id="valued_mrp_report_picking"
         inherit_id="stock_picking_report_valued.valued_report_picking"
     >
-        <!-- show only one row for kit products -->
-        <xpath expr="//tr[@t-foreach='package_move_lines']" position="before">
-            <t t-if="o.valued and o.sale_id and o.move_line_ids and is_outgoing">
-                <t
-                    t-set="package_move_lines"
-                    t-value="package_move_lines.filtered(lambda l: not l.phantom_product_id or l.phantom_line)"
-                />
-            </t>
-        </xpath>
-        <xpath expr="//tr[@t-foreach='move_lines']" position="before">
-            <t t-if="o.valued and o.sale_id and o.move_line_ids and is_outgoing">
-                <t
-                    t-set="move_lines"
-                    t-value="move_lines.filtered(lambda l: not l.phantom_product_id or l.phantom_line)"
-                />
-            </t>
-        </xpath>
-        <xpath expr="//tr[@t-foreach='o.move_line_ids']" position="attributes">
-            <attribute name="t-foreach">has_no_packages_move_lines</attribute>
-        </xpath>
-        <xpath expr="//tr[@t-foreach='has_no_packages_move_lines']" position="before">
-            <t t-set="has_no_packages_move_lines" t-value="o.move_line_ids" />
+        <!-- Show only one row for kit products -->
+        <xpath expr="//table[@name='stock_move_line_table']/tbody" position="before">
             <t t-if="o.valued and o.sale_id and o.move_line_ids and is_outgoing">
                 <t
-                    t-set="has_no_packages_move_lines"
-                    t-value="has_no_packages_move_lines.filtered(lambda l: not l.phantom_product_id or l.phantom_line)"
+                    t-set="lines"
+                    t-value="o.move_line_ids.filtered(lambda l: not l.phantom_product_id or l.phantom_line)"
                 />
             </t>
         </xpath>
@@ -69,10 +40,10 @@
         <xpath expr="//span[@t-field='move_line.product_id']" position="before">
             <span t-field="move_line.sale_line.product_id" t-if="can_display_phantom" />
         </xpath>
-        <xpath expr="//td[@name='move_line_lot_qty_done']" position="attributes">
+        <xpath expr="//td[@name='move_line_lot_quantity']" position="attributes">
             <attribute name="t-if">not can_display_phantom</attribute>
         </xpath>
-        <xpath expr="//td[@name='move_line_lot_qty_done']" position="after">
+        <xpath expr="//td[@name='move_line_lot_quantity']" position="after">
             <td class="text-center" t-if="can_display_phantom">
                 <span t-field="move_line.phantom_delivered_qty" />
                 <span t-field="move_line.sale_line.product_uom" />

stock_picking_report_valued_sale_mrp/tests/test_stock_picking_report_valued_mrp.py

@@ -18,10 +18,10 @@ def setUpClass(cls):
             {"name": "Product test 1", "type": "consu"}
         )
         cls.product_kit_comp_1 = cls.product_product.create(
-            {"name": "Product Component 1", "type": "product"}
+            {"name": "Product Component 1", "type": "consu"}
         )
         cls.product_kit_comp_2 = cls.product_product.create(
-            {"name": "Product Component 2", "type": "product"}
+            {"name": "Product Component 2", "type": "consu"}
         )
         cls.bom = cls.env["mrp.bom"].create(
             {
@@ -43,7 +43,7 @@ def setUpClass(cls):
             }
         )
         cls.product_2 = cls.product_product.create(
-            {"name": "Product test 2", "type": "product"}
+            {"name": "Product test 2", "type": "consu"}
         )
         order_form = Form(cls.env["sale.order"])
         order_form.partner_id = cls.partner
@@ -64,7 +64,7 @@ def setUpClass(cls):
 
     def test_01_picking_confirmed(self):
         for line in self.order_out_picking.move_ids:
-            line.quantity_done = line.product_uom_qty
+            line.quantity = line.product_uom_qty
         self.order_out_picking.button_validate()
         self.assertAlmostEqual(self.order_out_picking.amount_untaxed, 149.5)
         self.assertAlmostEqual(self.order_out_picking.amount_tax, 14.95)