fieldservice_sale Fix invoicing in v13

Author: hparfr

fieldservice_sale/models/sale_order.py

@@ -146,92 +146,6 @@ def _action_confirm(self):
             self.order_line._field_service_generation()
         return result
 
-    def _create_invoices(self, grouped=False, final=False):
-        Invoices = self.env["account.move"]
-        InvoiceLines = self.env["account.move.line"]
-        invoice_ids = super()._create_invoices(grouped, final)
-        result = invoice_ids or Invoices
-
-        for invoice in invoice_ids:
-            # check for invoice lines with product
-            # field_service_tracking = line
-            lines_by_line = InvoiceLines.search(
-                [
-                    ("move_id", "=", invoice.id),
-                    ("product_id.field_service_tracking", "=", "line"),
-                    ("exclude_from_invoice_tab", "=", False),
-                ]
-            )
-            if len(lines_by_line) > 0:
-                # Create a new invoice for each "line" product
-                line_count = len(invoice.invoice_line_ids)
-                for i in range(len(lines_by_line)):
-                    duplicate = True
-                    if ((i + 1) == len(lines_by_line)) and ((i + 1) == line_count):
-                        # Don't create a new invoice if there's only 1 product
-                        duplicate = False
-                    inv = invoice
-                    if duplicate:
-                        inv = invoice.copy()
-                        inv.with_context(check_move_validity=False).write(
-                            {"invoice_line_ids": [(6, 0, [])]}
-                        )
-                        lines_by_line[i].with_context(
-                            check_move_validity=False
-                        ).move_id = inv.id
-                        inv.with_context(
-                            check_move_validity=False
-                        )._recompute_dynamic_lines(
-                            recompute_all_taxes=True, recompute_tax_base_amount=True
-                        )
-                        invoice.with_context(
-                            check_move_validity=False
-                        )._recompute_dynamic_lines(
-                            recompute_all_taxes=True, recompute_tax_base_amount=True
-                        )
-                        result |= inv
-                    inv.fsm_order_ids = [(4, lines_by_line[i].fsm_order_id.id)]
-            # check for invoice lines with product
-            # field_service_tracking = sale
-            lines_by_sale = InvoiceLines.search(
-                [
-                    ("move_id", "=", invoice.id),
-                    ("product_id.field_service_tracking", "=", "sale"),
-                    ("exclude_from_invoice_tab", "=", False),
-                ]
-            )
-            if len(lines_by_sale) > 0:
-                # Create a new invoice for "sale" products
-                fsm_orders = self.env["fsm.order"].search(
-                    [("sale_id", "in", self.ids), ("sale_line_id", "=", False)]
-                )
-                if len(lines_by_sale) == len(invoice.invoice_line_ids):
-                    # Don't create a new invoice if all products are "sale"
-                    invoice.fsm_order_ids = [
-                        (4, fsm_order.id) for fsm_order in fsm_orders
-                    ]
-                elif len(invoice.invoice_line_ids) > len(lines_by_sale):
-                    new = invoice.copy()
-                    new.fsm_order_ids = [(4, fsm_order.id) for fsm_order in fsm_orders]
-                    new.with_context(check_move_validity=False).write(
-                        {"invoice_line_ids": [(6, 0, [])]}
-                    )
-                    lines_by_sale.with_context(check_move_validity=False).write(
-                        {"move_id": new.id}
-                    )
-                    new.with_context(
-                        check_move_validity=False
-                    )._recompute_dynamic_lines(
-                        recompute_all_taxes=True, recompute_tax_base_amount=True
-                    )
-                    invoice.with_context(
-                        check_move_validity=False
-                    )._recompute_dynamic_lines(
-                        recompute_all_taxes=True, recompute_tax_base_amount=True
-                    )
-                    result |= new
-        return result
-
     def action_view_fsm_order(self):
         fsm_orders = self.mapped("fsm_order_ids")
         action = self.env.ref("fieldservice.action_fsm_dash_order").read()[0]

fieldservice_sale/models/sale_order_line.py

@@ -1,5 +1,6 @@
 # Copyright (C) 2019 Brian McMaster
 # Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2020 [email protected]
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import _, api, fields, models
 
@@ -29,7 +30,10 @@ def _compute_product_updatable(self):
     def _compute_qty_delivered_method(self):
         super(SaleOrderLine, self)._compute_qty_delivered_method()
         for line in self:
-            if not line.is_expense and line.product_id.field_service_tracking == "line":
+            if not line.is_expense and line.product_id.field_service_tracking in (
+                "sale",
+                "line",
+            ):
                 line.qty_delivered_method = "field_service"
 
     @api.depends("fsm_order_id.stage_id")
@@ -139,7 +143,7 @@ def _field_service_generation(self):
             if rec.product_id.field_service_tracking == "line":
                 rec._field_find_fsm_order()
 
-    def _prepare_invoice_line(self, qty):
-        res = super()._prepare_invoice_line(qty)
+    def _prepare_invoice_line(self):
+        res = super()._prepare_invoice_line()
         res.update({"fsm_order_id": self.fsm_order_id.id})
         return res

fieldservice_sale/tests/test_fsm_sale_order.py

@@ -319,25 +319,14 @@ def test_sale_order_3(self):
         invoices = self.sale_order_3._create_invoices()
         # 2 invoices created
         self.assertEqual(
-            len(invoices.ids), 2, "FSM Sale: Sale Order 3 should create 2 invoices"
-        )
-        inv_fsm_orders = FSM_Order
-        for inv in invoices:
-            inv_fsm_orders |= inv.fsm_order_ids
-        self.assertTrue(
-            fsm_order_1 in inv_fsm_orders,
-            "FSM Sale: FSM Order 1 should be linked to invoice",
-        )
-        self.assertTrue(
-            fsm_order_2 in inv_fsm_orders,
-            "FSM Sale: FSM Order 2 should be linked to invoice",
+            len(invoices.ids), 1, "FSM Sale: Sale Order 3 should create 1 invoices"
         )
 
     def test_sale_order_4(self):
         """Test sale order 4 flow from sale to invoice.
         - Two FSM orders linked to the Sale Order Lines should be created.
         - One FSM order linked to the Sale Order should be created.
-        - Three Invoices should be created (One for each FSM Order).
+        - One Invoice should be created (One for all FSM Order).
         """
         sol1 = self.sol_service_per_line_4
         sol2 = self.sol_service_per_line_5
@@ -406,13 +395,5 @@ def test_sale_order_4(self):
         invoices = self.sale_order_4._create_invoices()
         # 3 invoices created
         self.assertEqual(
-            len(invoices.ids), 3, "FSM Sale: Sale Order 4 should create 3 invoices"
-        )
-        inv_fsm_orders = FSM_Order
-        for inv in invoices:
-            inv_fsm_orders |= inv.fsm_order_ids
-        self.assertEqual(
-            len(inv_fsm_orders.ids),
-            3,
-            "FSM Sale: There should be 3 orders for 3 invoices",
+            len(invoices.ids), 1, "FSM Sale: Sale Order 4 should create 1 invoice"
         )