[17.0] [MIG] sale_order_invoicing_grouping_criteria: Migration to 17.0 #1752

RogerSans · 2024-07-02T15:23:44Z

supersede: #1707
Standard migration
T-6282
@HaraldPanten

…rouping criteria This module allows to use custom criteria for grouping sales orders to be invoiced. Default criteria for grouping (invoicing partner and currency used) will be always applied, as if not respected, there will be business inconsistencies, but you can add more fields to split the invoicing according them. Configuration ============= For creating new grouping criteria: 1. Go to *Invoicing > Configuration > Management > Invoicing Grouping Criteria*. 2. Create or modify existing criteria, selecting fields belonging to "Sales Order" header model for grouping according them. 3. Invoicing address and currency will always be applied with the selected ones. For setting a different grouping criteria for a specific customer: 1. Go to *Invoicing > Sales > Master Data > Customers*. 2. Open the desired customer. 3. Go to *Invoicing* page. 4. Set on "Sales Invoicing Grouping Criteria" the desired grouping criteria. For setting a different default grouping criteria than the standard for the whole company: 1. Go to *Invoicing > Configuration> Settings*. 2. Locate inside "Sales Order Invoicing" section, the field "Default Grouping Criteria". 3. Introduce there the grouping criteria to be applied by default. If empty, the general default of invoicing address + currency will be applied. Usage ===== 1. Go to *Sales > Invoicing > Orders to Invoice*. 2. Select sales orders whose invoicing you want to do. 3. Click on *Action > Invoice Order*. 4. Click on "Create and View Invoices" button. 5. On that moment, the grouping criteria will be applied, and you will see different invoices if the criteria doesn't match for them.

- Standard procedure - Adapt code

…d of list

Odoo now includes a hook for obtaining the grouping criteria, so we are making use of it for cleaning some code and being compatible with other developments. We also clarifies in documentation the new company grouping criteria also introduced by Odoo, as v13 allows to see several companies at the same time.

…riteria, but slice super calls It turns out that the grouping criteria is applied over the invoice vals dictionary list instead on sales order so you can't group by any field in sales order, including the trick of slicing by ID for not grouping at all. We then restore and adapt the v12 code, that slices the recordset in pieces according the grouping criteria with fields obtained in the sales orders.

- The partner to get the grouping criteria should be the invoice address (if set) as this one will be used to create the invoice; - Extract this part into a function to have a overwritable point; - Little improvement into unit test: disable tracking.

The function signature has changed in 14.0

…ights"

Currently translated at 100.0% (21 of 21 strings) Translation: account-invoicing-15.0/account-invoicing-15.0-sale_order_invoicing_grouping_criteria Translate-URL: https://translation.odoo-community.org/projects/account-invoicing-15-0/account-invoicing-15-0-sale_order_invoicing_grouping_criteria/fr/

Currently translated at 100.0% (21 of 21 strings) Translation: account-invoicing-15.0/account-invoicing-15.0-sale_order_invoicing_grouping_criteria Translate-URL: https://translation.odoo-community.org/projects/account-invoicing-15-0/account-invoicing-15-0-sale_order_invoicing_grouping_criteria/ca/

…(not demo data)

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: account-invoicing-16.0/account-invoicing-16.0-sale_order_invoicing_grouping_criteria Translate-URL: https://translation.odoo-community.org/projects/account-invoicing-16-0/account-invoicing-16-0-sale_order_invoicing_grouping_criteria/

Currently translated at 100.0% (21 of 21 strings) Translation: account-invoicing-16.0/account-invoicing-16.0-sale_order_invoicing_grouping_criteria Translate-URL: https://translation.odoo-community.org/projects/account-invoicing-16-0/account-invoicing-16-0-sale_order_invoicing_grouping_criteria/ca/

Currently translated at 100.0% (21 of 21 strings) Translation: account-invoicing-16.0/account-invoicing-16.0-sale_order_invoicing_grouping_criteria Translate-URL: https://translation.odoo-community.org/projects/account-invoicing-16-0/account-invoicing-16-0-sale_order_invoicing_grouping_criteria/de/

Currently translated at 66.6% (14 of 21 strings) Translation: account-invoicing-16.0/account-invoicing-16.0-sale_order_invoicing_grouping_criteria Translate-URL: https://translation.odoo-community.org/projects/account-invoicing-16-0/account-invoicing-16-0-sale_order_invoicing_grouping_criteria/it/

Currently translated at 100.0% (21 of 21 strings) Translation: account-invoicing-16.0/account-invoicing-16.0-sale_order_invoicing_grouping_criteria Translate-URL: https://translation.odoo-community.org/projects/account-invoicing-16-0/account-invoicing-16-0-sale_order_invoicing_grouping_criteria/it/

HaraldPanten · 2024-07-02T16:19:42Z

/ocabot migration sale_order_invoicing_grouping_criteria

luis-ron

Functional Review: LGTM 👍🏻

Tisho99

Please, review the README, i think that the strings of the menus and the buttons have changed in v17

Here are 2 examples

Tisho99 · 2024-07-12T10:40:19Z

sale_order_invoicing_grouping_criteria/README.rst

+Usage
+=====
+
+1. Go to *Sales > Invoicing > Orders to Invoice*.


Suggested change

1. Go to *Sales > Invoicing > Orders to Invoice*.

1. Go to *Sales > To Invoice > Orders to Invoice*.

Tisho99 · 2024-07-12T11:50:54Z

sale_order_invoicing_grouping_criteria/README.rst

+
+1. Go to *Sales > Invoicing > Orders to Invoice*.
+2. Select sales orders whose invoicing you want to do.
+3. Click on *Action > Invoice Order*.


Suggested change

3. Click on *Action > Invoice Order*.

3. Click on *Action > Create Invoices*.

Tisho99 · 2024-07-12T12:42:19Z

sale_order_invoicing_grouping_criteria/tests/test_sale_order_invoicing_group_criteria.py

@@ -113,3 +114,8 @@ def test_commercial_field(self):
        self.assertEqual(
            children.sale_invoicing_grouping_criteria_id, self.grouping_criteria
        )
+
+    @classmethod


Are you sure this changes are needed? I think that if the requests library was nos used before we don't have to add this code

I refer to all changes done in tests

Tisho99 · 2024-07-15T08:54:46Z

sale_order_invoicing_grouping_criteria/tests/test_sale_order_invoicing_group_criteria.py

@@ -1,12 +1,13 @@
 # Copyright 2019 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

-from odoo.tests import TransactionCase
+from odoo.tests import TransactionCase, requests


You also need to remove this

Tisho99 · 2024-07-15T08:54:49Z

sale_order_invoicing_grouping_criteria/tests/test_sale_order_invoicing_group_criteria.py



 class TestSaleOrderInvoicingGroupingCriteria(TransactionCase):
    @classmethod
    def setUpClass(cls):
+        cls._super_send = requests.Session.send


You also need to remove this

Tisho99

LGTM

HaraldPanten

@RogerSans you forgot to add Sygel contributors. Didn't you?

RogerSans · 2024-07-15T14:47:43Z

@RogerSans you forgot to add Sygel contributors. Didn't you?

Yes, my mistake. Added.

HaraldPanten · 2024-07-16T12:10:20Z

/ocabot merge nobump

OCA-git-bot · 2024-07-16T12:10:40Z

What a great day to merge this nice PR. Let's do it!
Prepared branch 17.0-ocabot-merge-pr-1752-by-HaraldPanten-bump-nobump, awaiting test results.

OCA-git-bot · 2024-07-16T12:15:16Z

Congratulations, your PR was merged at 01cc8a2. Thanks a lot for contributing to OCA. ❤️

pedrobaeza and others added 30 commits July 2, 2024 16:02

[MIG] sale_order_invoicing_criteria: Migration to 12.0

19d0c82

- Standard procedure - Adapt code

[IMP] sale_order_invoicing_grouping_criteria: black, isort

7a0c290

[MIG] sale_order_invoicing_grouping_criteria: Migration to 13.0

73f6fe9

- Standard procedure - Adapt code

[FIX] sale_order_invoicing_grouping_criteria: Return recordset instea…

7befa1c

…d of list

[IMP] sale_order_invoicing_grouping_criteria: black, isort, prettier

4b7aabc

[MIG] sale_order_invoicing_grouping_criteria: Migration to 14.0

2011d50

Fix _create_invoice on sale_order_invoicing_grouping_criteria

373763b

The function signature has changed in 14.0

Added translation using Weblate (Catalan)

16dcea8

[MIG] sale_order_invoicing_grouping_criteria: Migration to 15.0

6ad7731

[15.0] [FIX] AccessError for user not having "Administration/Access R…

4a91b2b

…ights"

Added translation using Weblate (French)

9438fe6

[FIX] sale_order_invoicing_grouping_criteria: use valid user in test …

cc84d4a

…(not demo data)

[MIG] sale_order_invoicing_grouping_criteria: Migration to 16.0

c1330f6

[UPD] Update sale_order_invoicing_grouping_criteria.pot

1bb7a73

[UPD] README.rst

24bf152

[UPD] README.rst

00f1020

Added translation using Weblate (German)

5aa3d1a

Added translation using Weblate (Italian)

dc90def

[IMP] sale_order_invoicing_grouping_criteria: pre-commit auto fixes

43c2e5c

RogerSans changed the title ~~[17.0] [MIG] saleorder invoicing grouping criteria~~ [17.0] [MIG] sale_order_invoicing_grouping_criteria: Migration to 17.0 Jul 2, 2024

OCA-git-bot added this to the 17.0 milestone Jul 2, 2024

OCA-git-bot mentioned this pull request Jul 2, 2024

Migration to version 17.0 #1600

Open

46 tasks

RogerSans force-pushed the 17.0-mig-sale_order_invoicing_grouping_criteria branch from 8285c0d to 7fefdae Compare July 12, 2024 08:55

luis-ron approved these changes Jul 12, 2024

View reviewed changes

Tisho99 suggested changes Jul 12, 2024

View reviewed changes

Tisho99 reviewed Jul 12, 2024

View reviewed changes

RogerSans force-pushed the 17.0-mig-sale_order_invoicing_grouping_criteria branch 3 times, most recently from bfecd22 to 51adc71 Compare July 15, 2024 08:49

Tisho99 suggested changes Jul 15, 2024

View reviewed changes

RogerSans force-pushed the 17.0-mig-sale_order_invoicing_grouping_criteria branch 2 times, most recently from 7700732 to dc4c57f Compare July 15, 2024 09:25

Tisho99 approved these changes Jul 15, 2024

View reviewed changes

OCA-git-bot added the approved label Jul 15, 2024

HaraldPanten reviewed Jul 15, 2024

View reviewed changes

RogerSans force-pushed the 17.0-mig-sale_order_invoicing_grouping_criteria branch from 0627530 to 0e440ac Compare July 15, 2024 14:44

RogerSans force-pushed the 17.0-mig-sale_order_invoicing_grouping_criteria branch from 16fc4c3 to d35a09d Compare July 15, 2024 15:07

[MIG] sale_order_invoicing_grouping_criteria: Migration to 17.0

4351547

RogerSans force-pushed the 17.0-mig-sale_order_invoicing_grouping_criteria branch from 45a6308 to 4351547 Compare July 16, 2024 08:21

OCA-git-bot added the bot is merging ⏳ label Jul 16, 2024

OCA-git-bot merged commit 7986a0b into OCA:17.0 Jul 16, 2024
7 checks passed

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Jul 16, 2024

HaraldPanten deleted the 17.0-mig-sale_order_invoicing_grouping_criteria branch July 16, 2024 13:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[17.0] [MIG] sale_order_invoicing_grouping_criteria: Migration to 17.0 #1752

[17.0] [MIG] sale_order_invoicing_grouping_criteria: Migration to 17.0 #1752

RogerSans commented Jul 2, 2024 •

edited

Loading

HaraldPanten commented Jul 2, 2024

luis-ron left a comment

Tisho99 left a comment

Tisho99 Jul 12, 2024

RogerSans Jul 15, 2024

Tisho99 Jul 12, 2024

RogerSans Jul 15, 2024

Tisho99 Jul 12, 2024

Tisho99 Jul 12, 2024

RogerSans Jul 15, 2024

Tisho99 Jul 15, 2024

RogerSans Jul 15, 2024

Tisho99 Jul 15, 2024

RogerSans Jul 15, 2024

Tisho99 left a comment

HaraldPanten left a comment

RogerSans commented Jul 15, 2024

HaraldPanten commented Jul 16, 2024

OCA-git-bot commented Jul 16, 2024

OCA-git-bot commented Jul 16, 2024

	1. Go to Sales > Invoicing > Orders to Invoice.
	1. Go to Sales > To Invoice > Orders to Invoice.

	3. Click on Action > Invoice Order.
	3. Click on Action > Create Invoices.

[17.0] [MIG] sale_order_invoicing_grouping_criteria: Migration to 17.0 #1752

[17.0] [MIG] sale_order_invoicing_grouping_criteria: Migration to 17.0 #1752

Conversation

RogerSans commented Jul 2, 2024 • edited Loading

HaraldPanten commented Jul 2, 2024

luis-ron left a comment

Choose a reason for hiding this comment

Tisho99 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Tisho99 left a comment

Choose a reason for hiding this comment

HaraldPanten left a comment

Choose a reason for hiding this comment

RogerSans commented Jul 15, 2024

HaraldPanten commented Jul 16, 2024

OCA-git-bot commented Jul 16, 2024

OCA-git-bot commented Jul 16, 2024

RogerSans commented Jul 2, 2024 •

edited

Loading