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] partner_risk_insurance #177

Merged
merged 25 commits into from
Jun 17, 2022

Conversation

flachica
Copy link

No description provided.

@flachica flachica mentioned this pull request Mar 24, 2022
11 tasks
@rafaelbn
Copy link
Member

/ocabot migration partner_risk_insurance

@OCA-git-bot OCA-git-bot added this to the 15.0 milestone Mar 25, 2022
Copy link
Member

@flotho flotho left a comment

Choose a reason for hiding this comment

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

tested on runbot
code review
LGTM

@pedrobaeza
Copy link
Member

/ocabot migration partner_risk_insurance
/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Jun 16, 2022
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-177-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.

@pedrobaeza
Copy link
Member

@flachica please rebase and fix pre-commit linter errors.

@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). 🤖

campos and others added 14 commits June 17, 2022 13:32
[11.0][MIG] partner_risk_insurance: Migration to v11.0

[11.0][IMP] partner_risk_insurance: Fix ES translation

[UPD] README.rst

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: credit-control-11.0/credit-control-11.0-partner_risk_insurance
Translate-URL: https://translation.odoo-community.org/projects/credit-control-11-0/credit-control-11-0-partner_risk_insurance/

[UPD] README.rst

[UPD] Update partner_risk_insurance.pot

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: credit-control-11.0/credit-control-11.0-partner_risk_insurance
Translate-URL: https://translation.odoo-community.org/projects/credit-control-11-0/credit-control-11-0-partner_risk_insurance/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: credit-control-12.0/credit-control-12.0-partner_risk_insurance
Translate-URL: https://translation.odoo-community.org/projects/credit-control-12-0/credit-control-12-0-partner_risk_insurance/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: credit-control-13.0/credit-control-13.0-partner_risk_insurance
Translate-URL: https://translation.odoo-community.org/projects/credit-control-13-0/credit-control-13-0-partner_risk_insurance/
@flachica flachica force-pushed the 15.0-mig-partner_risk_insurance branch from c98d60d to 63f1199 Compare June 17, 2022 11:34
@flachica
Copy link
Author

@pedrobaeza rebase done! Thanks

@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-177-by-pedrobaeza-bump-nobump, awaiting test results.

@OCA-git-bot
Copy link
Contributor

@pedrobaeza The merge process could not be finalized, because command git push origin 15.0-ocabot-merge-pr-177-by-pedrobaeza-bump-nobump:15.0 failed with output:

To https://github.com/OCA/credit-control
 ! [remote rejected] 15.0-ocabot-merge-pr-177-by-pedrobaeza-bump-nobump -> 15.0 (cannot lock ref 'refs/heads/15.0': is at 5d4b8d61c03a43cfde62b16be4c7598e143479bf but expected b2a6f4963d69ebc91613a1e0398ca5f608d70a7d)
error: failed to push some refs to 'https://***@github.com/OCA/credit-control'

@OCA-git-bot OCA-git-bot merged commit 55d581b into OCA:15.0 Jun 17, 2022
@OCA-git-bot
Copy link
Contributor

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