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] [MIG] partner_deduplicate_acl #1805

Merged
merged 16 commits into from
Jul 11, 2024

Conversation

Deriman-Alonso
Copy link
Member

@Deriman-Alonso Deriman-Alonso commented Jul 5, 2024

Standart Migration

@Deriman-Alonso Deriman-Alonso changed the title [17.0 mig partner deduplicate acl [17.0] [MIG] partner_deduplicate_acl Jul 5, 2024
@Deriman-Alonso Deriman-Alonso mentioned this pull request Jul 5, 2024
65 tasks
@carolinafernandez-tecnativa

Functional review LGTM, Thanks :)
Could you please squash administrative commits? Thanks

@carolinafernandez-tecnativa

Functional review LGTM Thanks, Could you please squash administrative commits? https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

Thanks!

@Deriman-Alonso
Copy link
Member Author

Functional review LGTM Thanks, Could you please squash administrative commits? https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

Thanks!

Sure thing, Im on it! 😀

@Deriman-Alonso Deriman-Alonso force-pushed the 17.0-mig-partner_deduplicate_acl branch from ea2c1e1 to 73de651 Compare July 8, 2024 10:34
@Deriman-Alonso
Copy link
Member Author

@carolinafernandez-tecnativa Done! Ty for review.

@carolinafernandez-tecnativa

@carolinafernandez-tecnativa Done! Ty for review.

Still administrative commits im seeing, please check this https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

You have to squash oca-git commits and others defined on link sent before

@pedrobaeza
Copy link
Member

The commit history is definitely wrong, with 486 commits and most of them are not from this module.

@Deriman-Alonso
Copy link
Member Author

Hi @pedrobaeza , I personally do believe so, as when I followed the guide it got all the commits from the branch, might you tell me how to fix it? or is this the normal behaviour? Thanks

@pedrobaeza
Copy link
Member

I think the module variable hasn't been correctly set, so no filter was done in the procedure.

@Deriman-Alonso
Copy link
Member Author

So what would be the process to follow in order to fix it?

@pedrobaeza
Copy link
Member

The specified in https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-17.0, but taking into account if you don't have the standard bash, to adapt it to your CLI shell, or directly write the module name in the commands instead of the variable.

@Deriman-Alonso
Copy link
Member Author

The specified in https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-17.0, but taking into account if you don't have the standard bash, to adapt it to your CLI shell, or directly write the module name in the commands instead of the variable.

Taking into account that the commit history was properly until I followed the guide, I dont think it was the variable, but might be a missunderstanding on my part when following the command as for in the guide it says "git rebase -i origin/x, where x is the Odoo version (14.0, 15.0, 16.0,...).", so I replace the "x" with 17.0, should I have used the branch where I was doing the migration instead of the 17.0 base one?

yajo and others added 11 commits July 8, 2024 14:11
This module allows any user to get special permissions to be able to
deduplicate contacts, instead of just giving them to a sale manager with
settings permissions.

The new permissions allow the user to deduplicate:

- *Manually*.
- *Automatically* (dangerous).
- *Without restrictions* (more dangerous).

Beware what you do! 😯
…ers from the partner list views (action 'Merge automatically') Use <record id="crm.action_partner_merge"... to change only affected field.
* Don't overwrite code, but use inheritance system
* Add tests
Now there's an argument for controlling extra checks
Need adapt menu to not depends on crm module as before
@Deriman-Alonso Deriman-Alonso force-pushed the 17.0-mig-partner_deduplicate_acl branch from 73de651 to 96fbb96 Compare July 8, 2024 13:14
@pedrobaeza
Copy link
Member

No, it should be 17.0, but maybe you have an outdated fetch of such branch. Always do first git fetch origin 17.0 (where origin is OCA remote).

@pedrobaeza
Copy link
Member

This is the squash to be done:

image

CarlosRoca13 and others added 3 commits July 8, 2024 14:38
[MIG] partner_deduplicate_acl: Migration to 15.0

[FIX] partner_deduplicate_acl: Put menu on lower sequence

So that when clicking on Contacts main menu, it doesn't open the
wizard by default.

[FIX] partner_deduplicate_acl: Change menu group

The menu for deduplicating was only accessible for the users having the
group "Automatically", so the group "Manual" users weren't able to access
it.

This commits changes to this second group for both being able to access
@Deriman-Alonso Deriman-Alonso force-pushed the 17.0-mig-partner_deduplicate_acl branch from 96fbb96 to 6740da7 Compare July 8, 2024 13:39
@Deriman-Alonso
Copy link
Member Author

@pedrobaeza Hi, now it should be good,d can you check it out? Ty

@pedrobaeza
Copy link
Member

/ocabot migration partner_deduplicate_acl

@OCA-git-bot OCA-git-bot added this to the 17.0 milestone Jul 8, 2024
@@ -7,7 +7,7 @@
{
"name": "Deduplicate Contacts ACL",
"summary": "Contact deduplication with fine-grained permission control",
"version": "16.0.1.0.1",
"version": "17.0.1.0.0",
Copy link
Member

Choose a reason for hiding this comment

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

You have changed the module version in the "pre-commit auto-fixes" commit instead of the migration one. I know that you are receiving a pre-commit error when trying to commit this one, but that's why in the migration guide, it puts that you must put --no-verify in the command for avoiding it. At the end, it's just to follow strictly the migration guide. Please place this in the proper place. I'm being picky here because if not, reviewing by commit is not effective and error prone to not detect possible problems.

Copy link
Member Author

Choose a reason for hiding this comment

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

Absolutely understandable, omw to change it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Change is done now, although now the contributors change is now on the pre-commit fixes, which wouldnt be properly, only way to actually fully fix this is to re-do it from zero, if you would say that was the thing to do let me know and Ill re-do it, Ty

Copy link
Member

Choose a reason for hiding this comment

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

Don't worry, let's keep it this time this way, not being critical.

@Deriman-Alonso Deriman-Alonso force-pushed the 17.0-mig-partner_deduplicate_acl branch from 6740da7 to 62ef475 Compare July 9, 2024 07:44
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

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

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

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

@OCA-git-bot OCA-git-bot merged commit 47dc22b into OCA:17.0 Jul 11, 2024
6 of 7 checks passed
@OCA-git-bot
Copy link
Contributor

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

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

Successfully merging this pull request may close these issues.