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

[14.0] [IMP] purchase_sale_inter_company: sync pickings between companies #507

Merged
merged 6 commits into from
Oct 11, 2023
Merged

[14.0] [IMP] purchase_sale_inter_company: sync pickings between companies #507

merged 6 commits into from
Oct 11, 2023

Conversation

renda-dev
Copy link
Contributor

@renda-dev renda-dev commented Sep 1, 2023 •
edited
Loading

Migration of #362

Added some fixes and migration to v14

Disclaimer:

I've added some things in the CI's tests matrix because this module can't run it's test with stock_intercompany installed, since the purposes of these two modules are quite similar.

Also, I can't exclude stock_intercompany in this module's manifest.py because the runboat would not even start.

I'm totally open to suggestion on how we can handle this situation.

@renda-dev renda-dev force-pushed the 14.0-imp-purchase_sale_inter_company-receipt branch from 78aba10 to 54dff83 Compare September 4, 2023 14:10
@MiquelRForgeFlow
Copy link
Contributor

@renda-dev Maybe you are interested in #508.

@renda-dev renda-dev force-pushed the 14.0-imp-purchase_sale_inter_company-receipt branch from 54dff83 to a23f78c Compare September 6, 2023 13:03
@francesco-ooops francesco-ooops mentioned this pull request Sep 6, 2023
Merged
@aleuffre aleuffre force-pushed the 14.0-imp-purchase_sale_inter_company-receipt branch 3 times, most recently from 27cd537 to 1827dc7 Compare September 20, 2023 15:32
@francesco-ooops
Copy link
Contributor

@MiquelRForgeFlow would you mind reviewing this one?

We'll add tests soon.

@MiquelRForgeFlow
Copy link
Contributor

We'll add tests soon.

Then do you mind if I wait for the tests? haha

@renda-dev renda-dev force-pushed the 14.0-imp-purchase_sale_inter_company-receipt branch 5 times, most recently from 798bca3 to b23630f Compare October 2, 2023 10:14
francesco-ooops
francesco-ooops approved these changes Oct 2, 2023
View reviewed changes
Copy link
Contributor

@francesco-ooops francesco-ooops left a comment

Choose a reason for hiding this comment

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

Functional ok!

@francesco-ooops
Copy link
Contributor

@MiquelRForgeFlow @AaronHForgeFlow ready for review!

@renda-dev renda-dev force-pushed the 14.0-imp-purchase_sale_inter_company-receipt branch from b23630f to 1709c38 Compare October 3, 2023 07:27
ilyasProgrammer
ilyasProgrammer approved these changes Oct 3, 2023
View reviewed changes
Copy link
Member

@ilyasProgrammer ilyasProgrammer left a comment

Choose a reason for hiding this comment

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

Code LGTM

@francesco-ooops
Copy link
Contributor

@AaronHForgeFlow shall we merge? :)

@renda-dev renda-dev force-pushed the 14.0-imp-purchase_sale_inter_company-receipt branch 5 times, most recently from 4c08f4e to 0957cd6 Compare October 6, 2023 10:50
@francesco-ooops
Copy link
Contributor

@AaronHForgeFlow we got to cover with tests cases added by our changes, but not the ones from original PR.

Do you think it's good for merge?

Thank you!

@francesco-ooops
Copy link
Contributor

@JordiBForgeFlow can this be merged? AFAICS you're the only active PSC in this repo

AaronHForgeFlow
AaronHForgeFlow approved these changes Oct 9, 2023
View reviewed changes
Copy link
Contributor

@AaronHForgeFlow AaronHForgeFlow left a comment

Choose a reason for hiding this comment

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

code review LGTM

@renda-dev renda-dev force-pushed the 14.0-imp-purchase_sale_inter_company-receipt branch from 0957cd6 to 8859792 Compare October 11, 2023 09:41
@renda-dev
Copy link
Contributor Author

Rebase done

@francesco-ooops
Copy link
Contributor

@pedrobaeza try again please?

@pedrobaeza
Copy link
Member

/ocabot merge major

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Oct 11, 2023
@OCA-git-bot
Merge PR #507 into 14.0
7ce132c 
Signed-off-by pedrobaeza
@francesco-ooops
Copy link
Contributor

@pedrobaeza any idea on how to get out of this situation? It happened before but I can't remember what we did to fix it.

@pedrobaeza
Copy link
Member

This has happened before if the setup folders are manually created instead of created by pre-commit.

MiquelRForgeFlow
MiquelRForgeFlow reviewed Oct 11, 2023
View reviewed changes
Copy link
Contributor

@MiquelRForgeFlow MiquelRForgeFlow left a comment •
edited
Loading

Choose a reason for hiding this comment

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

In case you want to do some change, in addition do this.

.github/workflows/test.yml Outdated Show resolved Hide resolved
@renda-dev renda-dev force-pushed the 14.0-imp-purchase_sale_inter_company-receipt branch from 8859792 to 261ca0a Compare October 11, 2023 15:13
@renda-dev
Copy link
Contributor Author

Sorry for bothering you, but could you please try again? @pedrobaeza

@pedrobaeza
Copy link
Member

Rebel modules is conflicting in these cases. It's better to find the compatible way, and at the end that conflict will happen in your DBs:

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 14.0-ocabot-merge-pr-507-by-pedrobaeza-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 69e1451 into OCA:14.0 Oct 11, 2023
8 of 10 checks passed
@OCA-git-bot
Copy link
Contributor

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

@renda-dev renda-dev deleted the 14.0-imp-purchase_sale_inter_company-receipt branch October 11, 2023 15:56
@francesco-ooops
Copy link
Contributor

Thanks a lot for the support @pedrobaeza @MiquelRForgeFlow !

@renda-dev renda-dev mentioned this pull request Oct 23, 2023
Merged
@sebastienbeau sebastienbeau mentioned this pull request Oct 23, 2023
Merged
@aleuffre aleuffre mentioned this pull request Dec 11, 2023
Merged
@MiquelRForgeFlow MiquelRForgeFlow mentioned this pull request Jan 12, 2024
Closed
@ntsirintanis ntsirintanis mentioned this pull request Aug 26, 2024
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiquelRForgeFlow MiquelRForgeFlow MiquelRForgeFlow approved these changes

@francesco-ooops francesco-ooops francesco-ooops approved these changes

@AaronHForgeFlow AaronHForgeFlow AaronHForgeFlow approved these changes

@ilyasProgrammer ilyasProgrammer ilyasProgrammer approved these changes

Assignees
No one assigned
Labels
approved merged 🎉
Projects
None yet
Milestone
14.0
Development

Successfully merging this pull request may close these issues.
9 participants
@renda-dev @MiquelRForgeFlow @francesco-ooops @pedrobaeza @OCA-git-bot @ilyasProgrammer @AaronHForgeFlow @MateuGForgeFlow @aleuffre