[MIG] sale_invoice_plan: Migration to 18.0

Author: bizzappdev

sale_invoice_plan/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Sales Invoice Plan",
     "summary": "Add to sales order, ability to manage future invoice plan",
-    "version": "16.0.1.0.0",
+    "version": "18.0.1.0.0",
     "author": "Ecosoft,Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "website": "https://github.com/OCA/sale-workflow",

sale_invoice_plan/models/sale.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 from dateutil.relativedelta import relativedelta
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError, ValidationError
 from odoo.tools.float_utils import float_round
 
@@ -13,7 +13,7 @@ class SaleOrder(models.Model):
     invoice_plan_ids = fields.One2many(
         comodel_name="sale.invoice.plan",
         inverse_name="sale_id",
-        string="Inovice Plan",
+        string="Invoice Plan",
         copy=False,
     )
     use_invoice_plan = fields.Boolean(
@@ -31,7 +31,7 @@ class SaleOrder(models.Model):
     )
     invoice_plan_total_amount = fields.Monetary(
         compute="_compute_invoice_plan_total",
-        string="Total Amount",
+        string="Total Plan Amount",
     )
 
     @api.depends("invoice_plan_ids")
@@ -44,7 +44,7 @@ def _compute_invoice_plan_total(self):
     def _compute_invoice_plan_process(self):
         for rec in self:
             has_invoice_plan = rec.use_invoice_plan and rec.invoice_plan_ids
-            to_invoice = rec.invoice_plan_ids.filtered(lambda l: not l.invoiced)
+            to_invoice = rec.invoice_plan_ids.filtered(lambda plan: not plan.invoiced)
             inv_or_adv = rec.invoice_status == "to invoice" or (
                 rec.invoice_status == "no"
                 and "advance" in to_invoice.mapped("invoice_type")
@@ -59,20 +59,24 @@ def _check_invoice_plan_total_percent(self):
             installments = rec.invoice_plan_ids.filtered("installment")
             invoice_plan_total_percent = sum(installments.mapped("percent"))
             if float_round(invoice_plan_total_percent, 0) > 100:
-                raise UserError(_("Invoice plan total percentage must not exceed 100%"))
+                raise UserError(
+                    self.env._("Invoice plan total percentage must not exceed 100%")
+                )
 
     @api.constrains("state")
     def _check_invoice_plan(self):
         for rec in self:
             if rec.state != "draft":
-                if rec.invoice_plan_ids.filtered(lambda l: not l.percent):
+                if rec.invoice_plan_ids.filtered(lambda plan: not plan.percent):
                     raise ValidationError(
-                        _("Please fill percentage for all invoice plan lines")
+                        self.env._("Please fill percentage for all invoice plan lines")
                     )
 
     def action_confirm(self):
         if self.filtered(lambda r: r.use_invoice_plan and not r.invoice_plan_ids):
-            raise UserError(_("Use Invoice Plan selected, but no plan created"))
+            raise UserError(
+                self.env._("Use Invoice Plan selected, but no plan created")
+            )
         return super().action_confirm()
 
     def create_invoice_plan(

sale_invoice_plan/models/sale_invoice_plan.py

@@ -1,4 +1,4 @@
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError, ValidationError
 from odoo.tools.float_utils import float_compare, float_round
 
@@ -15,7 +15,9 @@ class SaleInvoicePlan(models.Model):
         readonly=True,
         ondelete="cascade",
     )
-    analytic_account_id = fields.Many2one(related="sale_id.analytic_account_id")
+    analytic_account_id = fields.Many2many(
+        related="sale_id.order_line.distribution_analytic_account_ids"
+    )
     partner_id = fields.Many2one(
         comodel_name="res.partner",
         string="Customer",
@@ -104,7 +106,7 @@ def _compute_amount(self):
             # For last line, amount is the left over
             if rec.last:
                 installments = rec.sale_id.invoice_plan_ids.filtered(
-                    lambda l: l.invoice_type == "installment"
+                    lambda plan: plan.invoice_type == "installment"
                 )
                 prev_amount = sum((installments - rec).mapped("amount"))
                 rec.amount = amount_untaxed - prev_amount
@@ -117,7 +119,7 @@ def _inverse_amount(self):
             if rec.sale_id.amount_untaxed != 0:
                 if rec.last:
                     installments = rec.sale_id.invoice_plan_ids.filtered(
-                        lambda l: l.invoice_type == "installment"
+                        lambda invoice_plan: invoice_plan.invoice_type == "installment"
                     )
                     prev_percent = sum((installments - rec).mapped("percent"))
                     rec.percent = 100 - prev_percent
@@ -142,23 +144,17 @@ def _compute_to_invoice(self):
     def _get_amount_invoice(self, invoices):
         """Hook function"""
         amount_invoiced = sum(invoices.mapped("amount_untaxed"))
-        deposit_product_id = (
-            self.env["ir.config_parameter"]
-            .sudo()
-            .get_param("sale.default_deposit_product_id")
+        lines = invoices.mapped("invoice_line_ids").filtered(
+            lambda invoice_line: invoice_line.product_id.id
         )
-        if deposit_product_id:
-            lines = invoices.mapped("invoice_line_ids").filtered(
-                lambda l: l.product_id.id != int(deposit_product_id)
-            )
-            amount_invoiced = sum(lines.mapped("price_subtotal"))
+        amount_invoiced = sum(lines.mapped("price_subtotal"))
         return amount_invoiced
 
     @api.depends("invoice_move_ids.state")
     def _compute_invoiced(self):
         for rec in self:
             invoiced = rec.invoice_move_ids.filtered(
-                lambda l: l.state in ("draft", "posted")
+                lambda move_line: move_line.state in ("draft", "posted")
             )
             rec.invoiced = True if invoiced else False
             rec.amount_invoiced = (
@@ -178,7 +174,9 @@ def _compute_new_invoice_quantity(self, invoice_move):
             return
         percent = self.percent
         move = invoice_move.with_context(check_move_validity=False)
-        for line in move.invoice_line_ids:
+        for line in move.invoice_line_ids.filtered(
+            lambda line: line.display_type not in ("line_section", "line_note")
+        ):
             self._update_new_quantity(line, percent)
         move.line_ids.filtered(
             lambda x: x.display_type
@@ -188,7 +186,7 @@ def _compute_new_invoice_quantity(self, invoice_move):
     def _update_new_quantity(self, line, percent):
         """Hook function"""
         if not len(line.sale_line_ids) >= 0:
-            raise UserError(_("No matched order line for invoice line"))
+            raise UserError(self.env._("No matched order line for invoice line"))
         order_line = fields.first(line.sale_line_ids)
         if order_line.is_downpayment:  # based on 1 unit
             line.write({"quantity": -percent / 100})
@@ -197,9 +195,14 @@ def _update_new_quantity(self, line, percent):
             prec = order_line.product_uom.rounding
             if plan_qty:
                 plan_qty = float_round(plan_qty, precision_rounding=prec)
-            if float_compare(abs(plan_qty), abs(line.quantity), prec) == 1:
+            if (
+                float_compare(
+                    abs(plan_qty), abs(line.quantity), precision_rounding=prec
+                )
+                == 1
+            ):
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "Plan quantity: %(plan_qty)s, exceed invoiceable quantity: "
                         "%(invoiceable_qty)s"
                         "\nProduct should be delivered before invoice"
@@ -218,7 +221,7 @@ def unlink(self):
         if lines:
             installments = [str(x) for x in lines.mapped("installment")]
             raise UserError(
-                _(
+                self.env._(
                     "Installment %s: already used and not allowed to delete.\n"
                     "Please discard changes."
                 )

sale_invoice_plan/security/ir.model.access.csv

@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sale_invoice_plan,access_sale_invoice_plan,model_sale_invoice_plan,,1,1,1,1
-access_sale_create_invoice_plan,access_sale_create_invoice_plan,model_sale_create_invoice_plan,,1,1,1,1
-access_sale_make_planned_invoice,access_sale_make_planned_invoice,model_sale_make_planned_invoice,,1,1,1,1
+access_sale_invoice_plan,access_sale_invoice_plan,model_sale_invoice_plan,sales_team.group_sale_salesman,1,1,1,1
+access_sale_create_invoice_plan,access_sale_create_invoice_plan,model_sale_create_invoice_plan,sales_team.group_sale_salesman,1,1,1,1
+access_sale_make_planned_invoice,access_sale_make_planned_invoice,model_sale_make_planned_invoice,sales_team.group_sale_salesman,1,1,1,1

sale_invoice_plan/tests/test_sale_invoice_plan.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 import logging
 
-from odoo import _, fields
+from odoo import fields
 from odoo.exceptions import UserError, ValidationError
 from odoo.tests import Form, tagged
 
@@ -85,7 +85,9 @@ def setUpClass(cls):
                         },
                     )
                 ],
-                "pricelist_id": cls.env.ref("product.list0").id,
+                "pricelist_id": cls.env["product.pricelist"]
+                .browse(cls.env.context.get("pricelist"))
+                .id,
             }
         )
 
@@ -124,22 +126,6 @@ def setUpClassicProducts(cls):
                 "categ_id": cls.product_category.id,
             }
         )
-        # Advance Product
-        deposit_account = cls.env["account.account"].search(
-            [("internal_group", "=", "income"), ("deprecated", "=", False)], limit=1
-        )
-        cls.product_advance = cls.env["product.product"].create(
-            {
-                "name": _("Down payment"),
-                "type": "service",
-                "invoice_policy": "order",
-                "property_account_income_id": deposit_account.id,
-                "taxes_id": False,
-            }
-        )
-        cls.env["ir.config_parameter"].sudo().set_param(
-            "sale.default_deposit_product_id", cls.product_advance.id
-        )
 
     def test_00_invoice_plan(self):
         # To create next invoice from SO
@@ -152,7 +138,9 @@ def test_00_invoice_plan(self):
         try:  # UserError if no installment
             plan = f.save()
         except ValidationError as e:
-            _logger.info(_("No installment raises following error : %s"), e.args[0])
+            _logger.info(
+                self.env._("No installment raises following error : %s"), e.args[0]
+            )
         # Create Invoice Plan 3 installment
         num_installment = 5
         f.num_installment = num_installment
@@ -241,7 +229,7 @@ def test_02_invoice_plan_with_advance(self):
         with self.assertRaises(ValidationError):
             self.so_service.action_confirm()
         advance_line = self.so_service.invoice_plan_ids.filtered(
-            lambda l: l.invoice_type == "advance"
+            lambda invoice_plan: invoice_plan.invoice_type == "advance"
         )
         self.assertEqual(len(advance_line), 1, "No one advance line")
         # Add 10% to advance
@@ -259,7 +247,9 @@ def test_02_invoice_plan_with_advance(self):
         # Valid total quantity of invoices (exclude Advance line)
         quantity = sum(
             invoices.mapped("invoice_line_ids")
-            .filtered(lambda l: l.product_id == self.product_order)
+            .filtered(
+                lambda invoice_line: invoice_line.product_id == self.product_order
+            )
             .mapped("quantity")
         )
         self.assertEqual(quantity, 1, "Wrong number of total invoice quantity")
@@ -323,7 +313,8 @@ def test_invoice_plan_so_edit(self):
                 ],
             }
         )
-        # Overall amount changed to 3080, install amount not changed, only percent changed.
+        # Overall amount changed to 3080, install amount not changed,
+        # only percent changed.
         self.assertEqual(self.so_service.amount_total, 3080.0)
         self.so_service.invoice_plan_ids._compute_amount()
         self.assertEqual(first_install.amount, 280.0)