[MIG] purchase_invoice_new_picking_line: Migration to 16.0

Signed-off-by: Carmen Bianca BAKKER <[email protected]>

Author: carmenbianca

purchase_invoice_new_picking_line/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Purchase Invoice New Picking Line",
     "summary": "When creating an invoice from incoming picking, also adds invoice lines for product that were not in the purchase order",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "author": "Coop IT Easy SCRLfs, Odoo Community Association (OCA)",
     "category": "Purchase",
     "license": "AGPL-3",

purchase_invoice_new_picking_line/models/__init__.py

@@ -1 +1 @@
-from . import account_invoice
+from . import purchase_order

purchase_invoice_new_picking_line/models/account_invoice.py

@@ -0,0 +1,87 @@
+# SPDX-FileCopyrightText: 2024 Coop IT Easy
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+from odoo import fields, models
+from odoo.fields import Command
+
+
+class PurchaseOrder(models.Model):
+    _inherit = "purchase.order"
+
+    def _prepare_account_move_lines_from_stock_move(
+        self, stock_move_id, account_move_id
+    ):
+        self.ensure_one()
+
+        product_id = stock_move_id.product_id
+        qty = max(stock_move_id.quantity_done, 0)
+        date = fields.Date.to_date(stock_move_id.date) or fields.Date.today()
+        supplierinfo = self.env["product.supplierinfo"]
+        price_unit = 0.0
+        if self.partner_id:
+            supplierinfo = product_id._select_seller(
+                partner_id=self.partner_id,
+                quantity=qty,
+                date=date,
+                uom_id=stock_move_id.product_uom,
+                params={"order_id": self},
+            )
+        if supplierinfo:
+            price_unit = supplierinfo.currency_id._convert(
+                supplierinfo.price,
+                self.currency_id,
+                self.company_id,
+                date,
+                round=False,
+            )
+        else:
+            price_unit = product_id.currency_id._convert(
+                product_id.lst_price,
+                self.currency_id,
+                self.company_id,
+                date,
+                round=False,
+            )
+        taxes = product_id.supplier_taxes_id.filtered(
+            lambda tax: tax.company_id == self.company_id
+        )
+        tax_ids = self.fiscal_position_id.map_tax(taxes)  # TODO not sure about this
+
+        data = {
+            "display_type": "product",
+            # Normally the name is '{order_name}: {order_line_name}'.
+            "name": "%s: %s" % (stock_move_id.picking_id.name, stock_move_id.name),
+            "product_id": product_id.id,
+            "product_uom_id": stock_move_id.product_uom.id,
+            "quantity": qty,
+            "price_unit": price_unit,
+            "tax_ids": [Command.set(tax_ids.ids)],
+        }
+
+        return data
+
+    def add_missing_picking_products_to_account_move(self, account_move_id):
+        stock_moves = self.env["stock.move"]
+        for picking in self.picking_ids.filtered(lambda x: x.state == "done"):
+            stock_moves |= picking.move_ids.filtered(
+                lambda move: move.state == "done" and not move.purchase_line_id
+            )
+        new_lines_data = [
+            self._prepare_account_move_lines_from_stock_move(
+                stock_move, account_move_id
+            )
+            for stock_move in stock_moves
+        ]
+        account_move_id.write(
+            {"invoice_line_ids": [Command.create(line) for line in new_lines_data]}
+        )
+
+    def action_create_invoice(self):
+        result = super().action_create_invoice()
+        res_id = result.get("res_id")
+        if not res_id:
+            return result
+        invoice_id = self.env["account.move"].browse(res_id)
+        self.add_missing_picking_products_to_account_move(invoice_id)
+        return result

purchase_invoice_new_picking_line/models/purchase_order.py

@@ -2,74 +2,121 @@
 #   Robin Keunen <[email protected]>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
+import datetime
 
-from odoo import tests
-from odoo.tests.common import Form
+from odoo import fields, tests
 
 
 class TestAccountInvoice(tests.common.TransactionCase):
-    def test_move_line_product_is_added_to_invoice(self):
-        purchase_order = self.browse_ref("purchase.purchase_order_4")
-        product = self.browse_ref("product.product_product_1")
-        supplier_loc = self.env.ref("stock.stock_location_suppliers")
-        stock_loc = self.env.ref("stock.warehouse0").lot_stock_id
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.purchase_order = cls.env.ref("purchase.purchase_order_4")
+        cls.product = cls.env.ref("product.product_product_1")
+        cls.supplier_loc = cls.env.ref("stock.stock_location_suppliers")
+        cls.stock_loc = cls.env.ref("stock.warehouse0").lot_stock_id
 
         # Confirm order
-        purchase_order.button_confirm()
-        picking = purchase_order.picking_ids
-        moves = picking.move_ids_without_package
-        self.assertEquals(len(purchase_order.order_line), len(moves))
+        cls.purchase_order.button_confirm()
+        cls.picking = cls.purchase_order.picking_ids
+        cls.moves = cls.picking.move_ids
+
+        cls.moves[0].quantity_done = cls.moves[0].product_qty
+        cls.moves[1].quantity_done = cls.moves[1].product_qty
+        cls.moves[2].quantity_done = cls.moves[2].product_qty - 1
+
+    def _validate_picking(self):
+        wizard = self.picking.button_validate()
+        backorder_confirmation = (
+            self.env[wizard["res_model"]].with_context(**wizard["context"]).create({})
+        )
+        backorder_confirmation.process_cancel_backorder()
 
-        moves[0].quantity_done = moves[0].product_qty
-        moves[1].quantity_done = moves[1].product_qty
-        moves[2].quantity_done = moves[2].product_qty - 1
+    def _create_invoice(self):
+        res = self.purchase_order.action_create_invoice()
+        return self.env["account.move"].browse(res["res_id"])
 
+    def test_move_line_product_is_added_to_invoice(self):
         new_move = self.env["stock.move"].create(
             {
-                "picking_id": picking.id,
-                "name": product.name,
-                "product_id": product.id,
-                "product_uom": product.uom_id.id,
+                "picking_id": self.picking.id,
+                "name": self.product.name,
+                "product_id": self.product.id,
+                "product_uom": self.product.uom_id.id,
                 "quantity_done": 20,
-                "location_id": supplier_loc.id,
-                "location_dest_id": stock_loc.id,
+                "location_id": self.supplier_loc.id,
+                "location_dest_id": self.stock_loc.id,
             }
         )
+        self._validate_picking()
 
-        wizard = picking.button_validate()
-        backorder_confirmation = self.env[wizard["res_model"]].browse(
-            wizard["res_id"]
-        )
-        backorder_confirmation.process_cancel_backorder()
-
-        res = purchase_order.with_context(
-            create_bill=True
-        ).action_view_invoice()
-        ctx = res.get("context")
-        f = Form(
-            self.env["account.invoice"].with_context(ctx),
-            view="account.invoice_supplier_form",
-        )
-        invoice = f.save()
+        invoice = self._create_invoice()
 
         self.assertRecordValues(
             invoice.invoice_line_ids,
             [
                 {
-                    "product_id": moves[0].product_id.id,
-                    "quantity": moves[0].quantity_done,
+                    "product_id": self.moves[0].product_id.id,
+                    "quantity": self.moves[0].quantity_done,
                 },
                 {
-                    "product_id": moves[1].product_id.id,
-                    "quantity": moves[1].quantity_done,
+                    "product_id": self.moves[1].product_id.id,
+                    "quantity": self.moves[1].quantity_done,
                 },
                 {
-                    "product_id": moves[2].product_id.id,
-                    "quantity": moves[2].quantity_done,
+                    "product_id": self.moves[2].product_id.id,
+                    "quantity": self.moves[2].quantity_done,
+                },
+                {
+                    "product_id": new_move.product_id.id,
+                    "quantity": new_move.quantity_done,
+                    "price_unit": self.product.lst_price,
+                    "product_uom_id": new_move.product_uom.id,
+                    "display_type": "product",
                 },
+            ],
+        )
+
+    def test_with_supplierinfo(self):
+        """Same test, but the price is now defined on supplierinfo instead of on
+        the product.
+        """
+        self.env["product.supplierinfo"].create(
+            {
+                "product_id": self.product.id,
+                "product_tmpl_id": self.product.product_tmpl_id.id,
+                "partner_id": self.purchase_order.partner_id.id,
+                "price": 1,
+                "currency_id": self.purchase_order.currency_id.id,
+                "date_start": fields.Date.today() - datetime.timedelta(days=90),
+                "date_end": fields.Date.today() + datetime.timedelta(days=90),
+            }
+        )
+        new_move = self.env["stock.move"].create(
+            {
+                "picking_id": self.picking.id,
+                "name": self.product.name,
+                "product_id": self.product.id,
+                "product_uom": self.product.uom_id.id,
+                "quantity_done": 20,
+                "location_id": self.supplier_loc.id,
+                "location_dest_id": self.stock_loc.id,
+            }
+        )
+        self._validate_picking()
+
+        invoice = self._create_invoice()
+
+        self.assertRecordValues(
+            invoice.invoice_line_ids[-1],
+            [
                 {
                     "product_id": new_move.product_id.id,
                     "quantity": new_move.quantity_done,
+                    "price_unit": 1,
+                    "product_uom_id": new_move.product_uom.id,
+                    "display_type": "product",
                 },
             ],
         )