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

[15.0] [MIG] product_form_sale_link #2138

Merged
merged 18 commits into from
Jun 2, 2023
Merged

[15.0] [MIG] product_form_sale_link #2138

merged 18 commits into from
Jun 2, 2023

Conversation

CRogos
Copy link
Contributor

@CRogos CRogos commented Jul 19, 2022

Now contain also the improvements: PR-2120

@CRogos
Copy link
Contributor Author

CRogos commented Sep 20, 2022

@ao-landoo would you be so kind and give me a review?

@ao-landoo
Copy link
Contributor

https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-15.0 has not been stricly followed. Migration commit is missing.

@oca-clabot
Copy link

Hey @CRogos, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: https://odoo-community.org/page/cla
Here is a list of the users:

Appreciation of efforts,
OCA CLAbot

@CRogos
Copy link
Contributor Author

CRogos commented Sep 20, 2022

@ao-landoo thank you for your feedback.
I am still a little unsure regarding this:
image

Shall I merge these two commits in the commit below (red) or above (green) arrow, or should it be left as is?
image

The CLA message is now caused by the v13 migration commits. Is there some action needed?

@CRogos
Copy link
Contributor Author

CRogos commented Oct 6, 2022

@ao-landoo I've now merged all OCA-git-bot commits with the commit above. Maybe you could have another look?

@CRogos
Copy link
Contributor Author

CRogos commented Oct 21, 2022

@MiquelRForgeFlow I've added you improvement to the v15 port. maybe you could review?

@CRogos
Copy link
Contributor Author

CRogos commented Nov 11, 2022

@simahawk could you also have a look at this?
I am trying to build some unit test for this, but I do not get it right.
https://github.com/CRogos/sale-workflow/tree/15.0-mig-product_form_sale_link2/product_form_sale_link/tests
Support highly welcome.

@simahawk
Copy link
Contributor

@simahawk could you also have a look at this? I am trying to build some unit test for this, but I do not get it right. https://github.com/CRogos/sale-workflow/tree/15.0-mig-product_form_sale_link2/product_form_sale_link/tests Support highly welcome.

What's the problem?

@CRogos
Copy link
Contributor Author

CRogos commented Nov 11, 2022

The result of pt.sale_lines_count is always 0 because

sale_line_data = self.env["sale.order.line"].read_group( domain, ["product_id"], ["product_id"] )

is always empty and I do not know how to mock this?

@CRogos
Copy link
Contributor Author

CRogos commented Feb 14, 2023

@pedrobaeza could you merge this?

@pedrobaeza
Copy link
Member

Merging blindly based on the reviews:

/ocabot migration product_form_sale_link
/ocabot merge nobump

@OCA-git-bot OCA-git-bot added this to the 15.0 milestone Feb 14, 2023
@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Feb 14, 2023
Signed-off-by pedrobaeza
@CRogos
Copy link
Contributor Author

CRogos commented Feb 17, 2023

@pedrobaeza not continuing since 3 days

@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Feb 17, 2023
Signed-off-by pedrobaeza
@CRogos
Copy link
Contributor Author

CRogos commented Feb 28, 2023

@pedrobaeza this isn't merging... anything I can do?

@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Feb 28, 2023
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 15.0-ocabot-merge-pr-2138-by-pedrobaeza-bump-nobump.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@dreispt
Copy link
Member

dreispt commented May 29, 2023

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 15.0-ocabot-merge-pr-2138-by-dreispt-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request May 29, 2023
Signed-off-by dreispt
@@ -0,0 +1 @@
../../../../product_form_sale_link
Copy link
Member

Choose a reason for hiding this comment

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

The merge issue is because this should be a symlink, not a regular file?
To be investigated is why the bot does not report the error.

Copy link
Contributor

Choose a reason for hiding this comment

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

The merge issue is because this should be a symlink, not a regular file? To be investigated is why the bot does not report the error.

As i can see here for example is the same:
https://github.com/OCA/sale-workflow/blob/16.0/setup/partner_sale_pivot/odoo/addons/partner_sale_pivot

Copy link
Member

Choose a reason for hiding this comment

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

No, that one is really a symbolic link:
image
You need to delete the file and re-run pre-commit locally on a platform that supports symbolic links to generate it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thx, I'll fix it.

rousseldenis and others added 18 commits June 1, 2023 16:11
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: sale-workflow-13.0/sale-workflow-13.0-product_form_sale_link
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-13-0/sale-workflow-13-0-product_form_sale_link/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: sale-workflow-14.0/sale-workflow-14.0-product_form_sale_link
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-14-0/sale-workflow-14-0-product_form_sale_link/
The button 'action_view_sales' is replaced in sale_stock, so it cannot be referenced.
@CRogos
Copy link
Contributor Author

CRogos commented Jun 2, 2023

@pedrobaeza can you retry? Readded Joan and fixed the symbolic link.

@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 15.0-ocabot-merge-pr-2138-by-pedrobaeza-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit c30db4e into OCA:15.0 Jun 2, 2023
@OCA-git-bot
Copy link
Contributor

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

@CRogos CRogos deleted the 15.0-mig-product_form_sale_link branch June 5, 2023 07:52
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.