Skip to content

Commit 18e2407

Browse files
committed
Merge PR #968 into 18.0
Signed-off-by pedrobaeza
2 parents 8a780b6 + 800ba6a commit 18e2407

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

account_invoice_inter_company/models/account_move.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,8 @@ def _inter_company_create_invoice(self, dest_company):
200200

201201
def _create_destination_account_move_line(self, dest_invoice, dest_company):
202202
dest_move_line_data = []
203-
for src_line in self.invoice_line_ids.filtered(
204-
lambda x: x.display_type == "product"
205-
):
206-
if not src_line.product_id:
203+
for src_line in self.invoice_line_ids:
204+
if src_line.display_type == "product" and not src_line.product_id:
207205
raise UserError(
208206
_(
209207
"The invoice line '%(line_name)s' doesn't have a product. "
@@ -361,6 +359,8 @@ def _prepare_account_move_line(self, dest_move, dest_company):
361359
"move_id": dest_move.id,
362360
"sequence": self.sequence,
363361
"auto_invoice_line_id": self.id,
362+
"name": self.name,
363+
"display_type": self.display_type,
364364
}
365365
# Compatibility with module account_invoice_start_end_dates
366366
if hasattr(self, "start_date") and hasattr(self, "end_date"):

account_invoice_inter_company/tests/test_inter_company_invoice.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ def setUpClass(cls):
285285
line_form.quantity = 1
286286
line_form.product_uom_id = cls.env.ref("uom.product_uom_hour")
287287
line_form.account_id = cls.a_sale_company_a
288-
line_form.name = "Service Multi Company"
288+
line_form.name = "Service Multi Company test"
289289
line_form.price_unit = 450.0
290290
cls.invoice_company_a = cls.invoice_company_a.save()
291291
cls.invoice_line_a = cls.invoice_company_a.invoice_line_ids[0]
@@ -382,6 +382,7 @@ def test03_confirm_invoice_and_cancel(self):
382382
invoice_line.product_id,
383383
self.invoice_company_a.invoice_line_ids[0].product_id,
384384
)
385+
self.assertEqual(invoice_line.name, "Service Multi Company test")
385386
# Cancel the invoice for company A
386387
invoice_origin = (
387388
f"{self.invoice_company_a.company_id.name} - "

0 commit comments

Comments
 (0)