Skip to content
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.

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

[17.0][FW] account_invoice_section_sale_order: multiple ports from 16.0 #1804

Open
wants to merge 4 commits into
base: 17.0
Choose a base branch
from

Conversation

@sebalix sebalix changed the title [17.0][FW] [17.0][FW] account_invoice_section_sale_order: multiple ports from 16.0 Sep 20, 2024
@sebalix sebalix force-pushed the oca-port-account_invoice_section_sale_order-16.0-to-17.0-56f4f0 branch from 1bef9cf to 18ba581 Compare September 20, 2024 13:32
@sebalix sebalix marked this pull request as ready for review September 20, 2024 14:13
Copy link
Contributor

@grindtildeath grindtildeath left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LG but as your fixup is touching multiple commits, IMO it's better to keep it as a separated commit for the migration of previous ones. Then you only need to reword it

@sebalix
Copy link
Contributor Author

sebalix commented Sep 26, 2024

@grindtildeath that would be better yes, but the downside of doing that is that we are still generating conflicts we need to resolve in a separate commit on each version, while updating the current patch one version after the other makes the port simpler.

In an ideal world, when someone propose a patch on a given version, he could take the opportunity to port it straight to the next versions so that will be same commit+author and he could amend it without issue (here with what I have done, I'm not the author of the adaptations).

EDIT: I didn't understood well your comment, it's OK now

@sebalix sebalix force-pushed the oca-port-account_invoice_section_sale_order-16.0-to-17.0-56f4f0 branch from 18ba581 to 04bcbb1 Compare September 26, 2024 13:28
grindtildeath and others added 4 commits September 26, 2024 15:28
Refactor preparation of sections

Refactor to allow different section grouping

Add field to allow different possibilities of grouping invoice lines from sale order
…on tests

In OCA repo, now we have this error:

 Traceback (most recent call last):
  File "/__w/account-invoicing/account-invoicing/account_invoice_section_sale_order/tests/test_invoice_group_by_sale_order.py", line 109, in test_create_invoice
    self.assertEqual(line.name, result[line.sequence][0])
KeyError: 1
@sebalix sebalix force-pushed the oca-port-account_invoice_section_sale_order-16.0-to-17.0-56f4f0 branch from 04bcbb1 to 8cd1abd Compare September 26, 2024 13:29
@sebalix
Copy link
Contributor Author

sebalix commented Sep 26, 2024

@grindtildeath fixup fixed & squashed :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants