Skip to content

[16.0][IMP] account_invoice_inter_company: support display type and retrieve invoice line name in auto invoice #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OCA-git-bot merged 1 commit into from
Apr 2, 2025
Merged

[16.0][IMP] account_invoice_inter_company: support display type and retrieve invoice line name in auto invoice #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions account_invoice_inter_company/models/account_move.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,8 @@ def _inter_company_create_invoice(self, dest_company):

def _create_destination_account_move_line(self, dest_invoice, dest_company):
dest_move_line_data = []
for src_line in self.invoice_line_ids.filtered(
lambda x: x.display_type == "product"
):
if not src_line.product_id:
for src_line in self.invoice_line_ids:
if src_line.display_type == "product" and not src_line.product_id:
raise UserError(
_(
"The invoice line '%(line_name)s' doesn't have a product. "
Expand Down Expand Up @@ -338,6 +336,8 @@ def _prepare_account_move_line(self, dest_move, dest_company):
"move_id": dest_move.id,
"sequence": self.sequence,
"auto_invoice_line_id": self.id,
"name": self.name,
"display_type": self.display_type,
}
# Compatibility with module account_invoice_start_end_dates
if hasattr(self, "start_date") and hasattr(self, "end_date"):
Expand Down
3 changes: 2 additions & 1 deletion account_invoice_inter_company/tests/test_inter_company_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ def setUpClass(cls):
line_form.quantity = 1
line_form.product_uom_id = cls.env.ref("uom.product_uom_hour")
line_form.account_id = cls.a_sale_company_a
line_form.name = "Service Multi Company"
line_form.name = "Service Multi Company test"
line_form.price_unit = 450.0
cls.invoice_company_a = cls.invoice_company_a.save()
cls.invoice_line_a = cls.invoice_company_a.invoice_line_ids[0]
Expand Down Expand Up @@ -449,6 +449,7 @@ def test03_confirm_invoice_and_cancel(self):
invoice_line.product_id,
self.invoice_company_a.invoice_line_ids[0].product_id,
)
self.assertEqual(invoice_line.name, self.invoice_line_a.name)
# Cancel the invoice of company A
invoice_origin = ("%s - Canceled Invoice: %s") % (
self.invoice_company_a.company_id.name,
Expand Down