applied pr DN

Author: jado95

l10n_it_delivery_note/README.rst

@@ -2,7 +2,7 @@
 ITA - Documento di trasporto
 ============================
 
-.. 
+..
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
@@ -153,6 +153,15 @@ permessi dell'utente.
 Le fatture generate dai DDT contengono i riferimenti al DDT stesso nelle
 righe nota.
 
+Fatturazione da DN
+------------------
+
+E' possibile creare una fattura selezionando una o più DN dello stesso
+partner dalla tree view tramite il wizard "crea fattura". Si può
+scegliere se includere anche i servizi non ancora fatturati dell'ordine
+di vendita correlato o considerare solo le righe nei DN. In maniera
+predefinita vengono dedotti gli eventuali anticipi fatturati.
+
 Accesso da portale
 ------------------
 
@@ -242,7 +251,7 @@ promote its widespread use.
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-MarcoCalcagni| |maintainer-aleuffre| |maintainer-renda-dev| 
+|maintainer-MarcoCalcagni| |maintainer-aleuffre| |maintainer-renda-dev|
 
 This module is part of the `OCA/l10n-italy <https://github.com/OCA/l10n-italy/tree/16.0/l10n_it_delivery_note>`_ project on GitHub.
 

l10n_it_delivery_note/models/account_invoice.py

@@ -4,6 +4,7 @@
 # @author: Gianmarco Conte <gconte@dinamicheaziendali.it>
 # Copyright (c) 2019, Link IT Europe Srl
 # @author: Matteo Bilotta <mbilotta@linkeurope.it>
+# Copyright (c) 2024, Nextev Srl <odoo@nextev.it>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import _, fields, models
@@ -148,13 +149,11 @@ def unlink(self):
         # Ripristino il valore delle delivery note
         # per poterle rifatturare
         inv_lines = self.mapped("invoice_line_ids")
-        all_dnls = inv_lines.mapped("sale_line_ids").mapped("delivery_note_line_ids")
-        inv_dnls = self.mapped("delivery_note_ids").mapped("line_ids")
-        dnls_to_unlink = all_dnls & inv_dnls
+        inv_dnls = inv_lines.mapped("delivery_note_line_id")
         res = super().unlink()
-        dnls_to_unlink.sync_invoice_status()
-        dnls_to_unlink.mapped("delivery_note_id")._compute_invoice_status()
-        for dn in dnls_to_unlink.mapped("delivery_note_id"):
+        inv_dnls.sync_invoice_status()
+        inv_dnls.mapped("delivery_note_id")._compute_invoice_status()
+        for dn in inv_dnls.mapped("delivery_note_id"):
             dn.state = "confirm"
         return res
 

l10n_it_delivery_note/models/account_invoice_line.py

@@ -12,4 +12,10 @@ class AccountInvoiceLine(models.Model):
     delivery_note_id = fields.Many2one(
         "stock.delivery.note", string="Delivery Note", readonly=True, copy=False
     )
+    delivery_note_line_id = fields.Many2one(
+        "stock.delivery.note.line",
+        string="Delivery Note Line",
+        readonly=True,
+        copy=False,
+    )
     note_dn = fields.Boolean(string="Note DN")

l10n_it_delivery_note/models/stock_delivery_note.py

@@ -5,7 +5,7 @@
 
 import datetime
 
-from odoo import _, api, fields, models
+from odoo import Command, _, api, fields, models
 from odoo.exceptions import UserError
 
 from ..mixins.delivery_mixin import (
@@ -363,6 +363,60 @@ def _domain_weight_uom(self):
         )
     ]
 
+    @api.constrains(
+        "type_id",
+        "transport_condition_id",
+        "goods_appearance_id",
+        "transport_reason_id",
+        "transport_method_id",
+    )
+    def _check_delivery_note_type_consistency(self):
+        for note in self:
+            if (
+                note.transport_condition_id
+                and note.type_id
+                not in note.transport_condition_id.available_delivery_note_type_ids
+            ):
+                raise UserError(
+                    _(
+                        "The delivery note type is not valid "
+                        "for the selected transport condition."
+                    )
+                )
+            if (
+                note.goods_appearance_id
+                and note.type_id
+                not in note.goods_appearance_id.available_delivery_note_type_ids
+            ):
+                raise UserError(
+                    _(
+                        "The delivery note type is not valid "
+                        "for the selected goods appearance."
+                    )
+                )
+            if (
+                note.transport_reason_id
+                and note.type_id
+                not in note.transport_reason_id.available_delivery_note_type_ids
+            ):
+                raise UserError(
+                    _(
+                        "The delivery note type is not valid "
+                        "for the selected transport reason."
+                    )
+                )
+            if (
+                note.transport_method_id
+                and note.type_id
+                not in note.transport_method_id.available_delivery_note_type_ids
+            ):
+                raise UserError(
+                    _(
+                        "The delivery note type is not valid "
+                        "for the selected transport method."
+                    )
+                )
+
     @api.depends("name", "partner_id", "partner_ref", "partner_id.display_name")
     def name_get(self):
         result = []
@@ -732,30 +786,6 @@ def _check_delivery_notes_before_invoicing(self):
                         }
                     )
 
-    def _fix_quantities_to_invoice(self, lines, invoice_method):
-        cache = {}
-
-        pickings_lines = lines.retrieve_pickings_lines(self.picking_ids)
-        other_lines = lines - pickings_lines
-
-        if not invoice_method or invoice_method == "dn":
-            for line in other_lines:
-                cache[line] = line.fix_qty_to_invoice()
-        elif invoice_method == "service":
-            for line in other_lines:
-                if line.product_id.type != "service":
-                    cache[line] = line.fix_qty_to_invoice()
-
-        pickings_move_ids = self.mapped("picking_ids.move_ids")
-        for line in pickings_lines.filtered(lambda line: len(line.move_ids) > 1):
-            move_ids = line.move_ids & pickings_move_ids
-            qty_to_invoice = sum(move_ids.mapped("quantity_done"))
-
-            if qty_to_invoice < line.qty_to_invoice:
-                cache[line] = line.fix_qty_to_invoice(qty_to_invoice)
-
-        return cache
-
     def action_invoice(self, invoice_method=False):
         self._check_delivery_notes_before_invoicing()
 
@@ -770,34 +800,58 @@ def action_invoice(self, invoice_method=False):
             )
             if not sale_ids:
                 continue
-            orders_lines = sale_ids.mapped("order_line").filtered(
-                lambda l: l.product_id  # noqa: E741
-            )
-
-            downpayment_lines = orders_lines.filtered(lambda l: l.is_downpayment)  # noqa: E741
-            invoiceable_lines = orders_lines.filtered(lambda l: l.is_invoiceable)  # noqa: E741
-
-            cache = self._fix_quantities_to_invoice(
-                invoiceable_lines - downpayment_lines, invoice_method
+            downpayment_lines_to_invoice = sale_ids.mapped("order_line").filtered(
+                lambda l: l.product_id and l.is_downpayment and l.qty_to_invoice < 0  # noqa: E741
             )
 
-            for downpayment in downpayment_lines:
-                order = downpayment.order_id
-                order_lines = order.order_line.filtered(
-                    lambda l: l.product_id and not l.is_downpayment  # noqa: E741
-                )
-
-                if order_lines.filtered(lambda l: l.need_to_be_invoiced):  # noqa: E741
-                    cache[downpayment] = downpayment.fix_qty_to_invoice()
-
             invoice_ids = sale_ids.filtered(
                 lambda o: o.invoice_status == DOMAIN_INVOICE_STATUSES[1]
             )._create_invoices(final=True)
 
-            for line, vals in cache.items():
-                line.write(vals)
+            invoice_line_ids = invoice_ids.invoice_line_ids
+            if invoice_method == "service":
+                invoice_line_ids = invoice_line_ids.filtered(
+                    lambda il: il.product_id.type != "service"
+                )
+
+            invoice_line_ids.unlink()
+
+            vals_list = []
+            sequence = 1
+            account_move = self.env["account.move"]
+            for dn in self:
+                vals_list.append(
+                    Command.create(account_move._prepare_note_dn_value(sequence, dn))
+                )
+                sequence += 1
+                for delivery_note_line in dn.line_ids:
+                    vals_list.append(
+                        Command.create(
+                            delivery_note_line._prepare_invoice_line(sequence=sequence)
+                        )
+                    )
+                    sequence += 1
+
+            if downpayment_lines_to_invoice:
+                vals_list.append(
+                    Command.create(
+                        {
+                            "sequence": sequence,
+                            "display_type": "line_section",
+                            "name": _("Down Payments"),
+                            "note_dn": True,
+                            "quantity": 0,
+                        }
+                    )
+                )
+                sequence += 1
+                for line in downpayment_lines_to_invoice:
+                    vals_list.append(
+                        Command.create(line._prepare_invoice_line(sequence=sequence))
+                    )
+                    sequence += 1
 
-            orders_lines._compute_qty_to_invoice()
+            invoice_ids.line_ids = vals_list
 
             for line in self.mapped("line_ids"):
                 line.write({"invoice_status": "invoiced"})
@@ -815,8 +869,6 @@ def action_invoice(self, invoice_method=False):
                     }
                 )
             self._compute_invoice_status()
-            invoices = self.env["account.move"].browse(invoice_ids.ids)
-            invoices.update_delivery_note_lines()
 
     def action_done(self):
         self.write({"state": DOMAIN_DELIVERY_NOTE_STATES[3]})

l10n_it_delivery_note/models/stock_delivery_note_line.py

@@ -3,7 +3,7 @@
 # @author: Giuseppe Borruso <gborruso@dinamicheaziendali.it>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import _, api, fields, models
+from odoo import Command, _, api, fields, models
 from odoo.exceptions import UserError
 
 DATE_FORMAT = "%d/%m/%Y"
@@ -197,3 +197,45 @@ def sync_invoice_status(self):
                 if invoice_status == "upselling"
                 else invoice_status
             )
+
+    def _prepare_invoice_line(self, **optional_values):
+        """Prepare the values to create the new invoice line for a DN line.
+        :param optional_values: any parameter that should be added to the
+        returned invoice line
+        :rtype: dict
+        """
+        self.ensure_one()
+        res = {
+            "display_type": "product",
+            "name": self.name,
+            "product_id": self.product_id.id,
+            "product_uom_id": self.product_uom_id.id,
+            "quantity": self.product_qty,
+            "discount": self.discount,
+            "price_unit": self.price_unit,
+            "tax_ids": [Command.set(self.tax_ids.ids)],
+            "sale_line_ids": [Command.link(self.sale_line_id.id)],
+            "delivery_note_line_id": self.id,
+        }
+        if optional_values.get("sequence"):
+            res["sequence"] = optional_values["sequence"]
+        analytic_account_id = self.sale_line_id.order_id.analytic_account_id.id
+        if (
+            self.sale_line_id.analytic_distribution
+            and not self.sale_line_id.display_type
+        ):
+            res["analytic_distribution"] = self.sale_line_id.analytic_distribution
+        if analytic_account_id and not self.sale_line_id.display_type:
+            analytic_account_id = str(analytic_account_id)
+            if "analytic_distribution" in res:
+                res["analytic_distribution"][analytic_account_id] = (
+                    res["analytic_distribution"].get(analytic_account_id, 0) + 100
+                )
+            else:
+                res["analytic_distribution"] = {analytic_account_id: 100}
+        if optional_values:
+            res.update(optional_values)
+        if self.display_type:
+            res["account_id"] = False
+        return res
+

l10n_it_delivery_note/readme/USAGE.md

@@ -39,6 +39,15 @@ permessi dell'utente.
 Le fatture generate dai DDT contengono i riferimenti al DDT stesso nelle
 righe nota.
 
+
+## Fatturazione da DN
+
+E' possibile creare una fattura selezionando una o più DN dello stesso partner
+dalla tree view tramite il wizard "crea fattura".
+Si può scegliere se includere anche i servizi non ancora fatturati dell'ordine
+di vendita correlato o considerare solo le righe nei DN.
+In maniera predefinita vengono dedotti gli eventuali anticipi fatturati.
+
 ## Accesso da portale
 
 Gli utenti portal hanno la possibilità di scaricare i report dei DDT di cui loro o la loro azienda padre sono impostati come destinatari o indirizzo di spedizione.

l10n_it_delivery_note/tests/test_stock_delivery_note_invoicing.py

@@ -98,7 +98,7 @@ def test_complete_invoicing_single_so(self):
         self.assertEqual(delivery_note_line.sale_line_id, order_line)
         self.assertEqual(delivery_note_line.product_qty, 1)
 
-        invoice_line = final_invoice.invoice_line_ids[0]
+        invoice_line = final_invoice.invoice_line_ids[1]
         self.assertEqual(invoice_line.sale_line_ids, order_line)
         self.assertEqual(invoice_line.quantity, 1)
 
@@ -120,7 +120,7 @@ def test_complete_invoicing_single_so(self):
         self.assertEqual(delivery_note_line.sale_line_id, order_line)
         self.assertEqual(delivery_note_line.product_qty, 2)
 
-        invoice_line = final_invoice.invoice_line_ids[1]
+        invoice_line = final_invoice.invoice_line_ids[2]
         self.assertEqual(invoice_line.sale_line_ids, order_line)
         self.assertEqual(invoice_line.quantity, 2)
 

l10n_it_delivery_note/wizard/delivery_note_invoice.py

@@ -3,7 +3,8 @@
 # @author: Giuseppe Borruso <gborruso@dinamicheaziendali.it>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
 
 INVOICE_STATUSES = [
     ("no", "Nothing to invoice"),
@@ -34,7 +35,28 @@ def create_invoices(self):
         delivery_note_ids = self.env["stock.delivery.note"].browse(
             self._context.get("active_ids", [])
         )
+        if len(delivery_note_ids.mapped("partner_id")) > 1:
+            raise UserError(_("You must select only delivery notes from one partner."))
         delivery_note_ids.action_invoice(self.invoice_method)
-        for invoice in delivery_note_ids.mapped("invoice_ids"):
+        invoices_ids = delivery_note_ids.mapped("invoice_ids")
+        for invoice in invoices_ids:
             invoice.invoice_date = self.invoice_date
-        return True
+        if len(invoices_ids) > 1:
+            return {
+                "name": _("Invoices"),
+                "type": "ir.actions.act_window",
+                "res_model": "account.move",
+                "view_type": "list",
+                "view_mode": "list",
+                "views": [[False, "list"], [False, "form"]],
+                "domain": [("id", "in", invoices_ids.ids)],
+            }
+        return {
+            "name": invoices_ids.display_name,
+            "type": "ir.actions.act_window",
+            "res_model": "account.move",
+            "view_type": "form",
+            "view_mode": "form",
+            "views": [[False, "form"]],
+            "res_id": invoices_ids.id,
+        }