[FIX] sale_operating_unit: allow to generate advance invoices with ou

Jarsa · Sep 8, 2023 · 2bcadfa · 2bcadfa
1 parent 9a67f3d
commit 2bcadfa
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/sale_operating_unit/models/sale_order.py b/sale_operating_unit/models/sale_order.py
@@ -69,7 +69,16 @@ def _check_company_operating_unit(self):
     def _prepare_invoice(self):
         self.ensure_one()
         invoice_vals = super(SaleOrder, self)._prepare_invoice()
-        invoice_vals["operating_unit_id"] = self.operating_unit_id.id
+        invoice_vals.update({
+            "operating_unit_id": self.operating_unit_id.id,
+            "journal_id": self.env["account.journal"].search(
+                [
+                    ("operating_unit_id", "=", self.operating_unit_id.id),
+                    ("type", "=", "sale"),
+                ],
+                limit=1,
+            ).id,
+        })
         return invoice_vals
 
 
@@ -81,3 +90,12 @@ class SaleOrderLine(models.Model):
         string="Operating Unit",
         store=True,
     )
+
+    def _prepare_invoice_line(self, **optional_values):
+        invoice_line_vals = super()._prepare_invoice_line(**optional_values)
+        invoice_line_vals.update(
+            {
+                "operating_unit_id": self.order_id.operating_unit_id.id,
+            }
+        )
+        return invoice_line_vals
diff --git a/sale_operating_unit/wizard/sale_make_invoice_advance.py b/sale_operating_unit/wizard/sale_make_invoice_advance.py
@@ -1,4 +1,5 @@
 from odoo import models
+from odoo.exceptions import ValidationError
 
 
 class SaleAdvancePaymentInv(models.TransientModel):
@@ -10,3 +11,24 @@ def _create_invoice(self, order, so_line, amount):
         )
         invoice.operating_unit_id = order.operating_unit_id.id
         return invoice
+
+    def _prepare_invoice_values(self, order, so_line):
+        invoice_vals = super()._prepare_invoice_values(order, so_line)
+        journal = self.env["account.journal"].search(
+            [
+                ("operating_unit_id", "=", order.operating_unit_id.id),
+                ("type", "=", "sale"),
+            ],
+            limit=1,
+        )
+        if not journal:
+            raise ValidationError(
+                _("You need to create a sales journal for this operating unit.")
+            )
+        invoice_vals.update(
+            {
+                "operating_unit_id": order.operating_unit_id.id,
+                "journal_id": journal.id,
+            }
+        )
+        return invoice_vals