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.

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

Jump to bottom

[12.0][MIG] partner_multi_company #136

Merged
merged 14 commits into from
Nov 14, 2019
Merged

[12.0][MIG] partner_multi_company #136

merged 14 commits into from
Nov 14, 2019

Conversation

kittiu
Copy link
Member

@kittiu kittiu commented Jun 18, 2019 •
edited

This was referenced Jun 18, 2019
Merged
Closed
Closed
@pedrobaeza pedrobaeza added this to the 12.0 milestone Jun 18, 2019
@MiquelRForgeFlow
Copy link
Contributor

MiquelRForgeFlow commented Aug 8, 2019 •
edited

@kittiu please, add 7671155.

@kittiu kittiu force-pushed the 12.0-mig-partner_multi_company branch from 0d6f101 to 78a6ec7 Compare August 9, 2019 06:24
@kittiu
Copy link
Member Author

kittiu commented Aug 9, 2019

@mreficent as requested, https://github.com/OCA/multi-company/compare/0d6f101eb30baa209d5c271b41047e4a4b9273de..78a6ec78dff5f589f7806cfad5326789af00d033

oihane and others added 13 commits October 16, 2019 09:36
@oihane @kittiu
New module partner_multi_company
7c4879d
@pedrobaeza @kittiu
partner_multi_company: Tests + README
7ca9e00
@pedrobaeza @kittiu
partner_multi_company: Sync company_ids field
5101f33
@pedrobaeza @kittiu
product_multi_company: Avoid errors in other tests
0b5eaf3 
This fix prevents errors when there are other tests that create partners
and base_suspend_security is still not ready. There can be still problems
if these partners are not created with SUPERUSER.
@pedrobaeza @kittiu
partner_multi_company: Migration to 9.0
07d18b6
@oca-transbot @kittiu
OCA Transbot updated translations from Transifex
8b7bf92
@lasley @kittiu
[MIG] partner_multi_company: Upgrade to v10
401f607 
* Bump versions
* Rename manifest
* Rename openerp to odoo
* Implement base_multi_company

Add depends

Swap dependencies

Add base_suspend_security depend back & server-tools repo

Fix tests

Add test for partner._commercial_fields

Why not both?!
@pedrobaeza @kittiu
[MIG] *_multi_company: OpenUpgrade migration scripts
59b7793
@oca-transbot @kittiu
OCA Transbot updated translations from Transifex
fa3b6d0
@cubells @kittiu
[MIG] partner_multi_company: Migration to 11.0
0add014
@pedrobaeza @kittiu
[MIG] partner_multi_company: Finish migration to 11.0
2350c9f
@oca-travis @kittiu
[UPD] Update partner_multi_company.pot
e0c8a9e
@oca-transbot @kittiu
Update translation files
8556306 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: multi-company-11.0/multi-company-11.0-partner_multi_company
Translate-URL: https://translation.odoo-community.org/projects/multi-company-11-0/multi-company-11-0-partner_multi_company/
@kittiu kittiu force-pushed the 12.0-mig-partner_multi_company branch from 78a6ec7 to 88955c1 Compare October 16, 2019 02:36
@kittiu
Copy link
Member Author

kittiu commented Oct 16, 2019 •
edited

Rebased, should be ready for merge. :)

@LoisRForgeFlow
Copy link
Contributor

Hi @kittiu

It seems this issue is still present in v12: #84. Tested on this PR's runbot:

picture-2019-22-10_1

I opened a pragmatic PR to solve it: #165. Can you have a look? maybe you have a better idea of what can be the root cause.

@pedrobaeza
Copy link
Member

Please include #165 here

@kittiu kittiu force-pushed the 12.0-mig-partner_multi_company branch from 88955c1 to 1b65f46 Compare October 23, 2019 14:45
@kittiu
Copy link
Member Author

kittiu commented Oct 23, 2019

fixed.

@LoisRForgeFlow
Copy link
Contributor

It is not a big deal but consider it, when you have to add fixes done in previous version to a migration in progress you have use the cherry-pick operation to preserve authorship, note that 7671155 and 5ee34a8 are being swallowed in your migration commit.

@kittiu
Copy link
Member Author

kittiu commented Oct 26, 2019

We will keep that in mind in the future. Thanks for your comments :)

@pedrobaeza pedrobaeza mentioned this pull request Oct 31, 2019
Closed
JoanSForgeFlow
JoanSForgeFlow approved these changes Nov 6, 2019
View reviewed changes
Copy link
Contributor

@JoanSForgeFlow JoanSForgeFlow left a comment

Choose a reason for hiding this comment

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

Functional review done!

@pedrobaeza
Copy link
Member

@lreficent can you finish your review?

LoisRForgeFlow
LoisRForgeFlow approved these changes Nov 14, 2019
View reviewed changes
Copy link
Contributor

@LoisRForgeFlow LoisRForgeFlow left a comment

Choose a reason for hiding this comment

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

Tested, LGTM 👍

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 12.0-ocabot-merge-pr-136-by-pedrobaeza-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Nov 14, 2019
@OCA-git-bot
Merge PR #136 into 12.0
858724f 
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 12.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 12.0-ocabot-merge-pr-136-by-pedrobaeza-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Nov 14, 2019
@OCA-git-bot
Merge PR #136 into 12.0
8bce5c2 
Signed-off-by pedrobaeza
@OCA-git-bot OCA-git-bot merged commit 1b65f46 into OCA:12.0 Nov 14, 2019
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 4921581. 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
Reviewers

@LoisRForgeFlow LoisRForgeFlow LoisRForgeFlow approved these changes

@JoanSForgeFlow JoanSForgeFlow JoanSForgeFlow approved these changes

Assignees
No one assigned
Labels
approved merged 🎉 ready to merge
Projects
None yet
Milestone
12.0
Development

Successfully merging this pull request may close these issues.

None yet