[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_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",
@@ -44,7 +43,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 +53,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,8 +73,9 @@ 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
             taxes = phantom_line.sale_tax_id.compute_all(

stock_picking_report_valued_sale_mrp/report/stock_picking_report_valued.xml

@@ -22,32 +22,12 @@
         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">
+        <!-- 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="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" />
-            <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="lines.filtered(lambda l: not l.phantom_product_id or l.phantom_line)"
                 />
             </t>
         </xpath>
@@ -69,10 +49,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)