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

[13.0][MIG] base_jsonify #1704

Merged
merged 27 commits into from
Oct 30, 2019
Merged

[13.0][MIG] base_jsonify #1704

merged 27 commits into from
Oct 30, 2019

Conversation

Laurent-Corron
Copy link

No description provided.

sebastienbeau and others added 26 commits October 18, 2019 09:27
remove copyrights from init and update copyrights
* [ADD] restore travis configuration

* [PEP] fix pep8

* [REF] exclude  product_categ_available_pos of testing due to issue odoo/odoo#23749
Currently translated at 100.0% (11 of 11 strings)

Translation: server-tools-12.0/server-tools-12.0-base_jsonify
Translate-URL: https://translation.odoo-community.org/projects/server-tools-12-0/server-tools-12-0-base_jsonify/zh_CN/
We can't change the order on ir.export.line since it's used to preserve the order speicifed by the user when creating a export filter into the UI
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: server-tools-12.0/server-tools-12.0-base_jsonify
Translate-URL: https://translation.odoo-community.org/projects/server-tools-12-0/server-tools-12-0-base_jsonify/
Copy link
Sponsor Contributor

@rousseldenis rousseldenis 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

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

@lmignon
Copy link
Sponsor Contributor

lmignon commented Oct 29, 2019

/ocabot merge

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 13.0-ocabot-merge-pr-1704-by-lmignon-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Oct 29, 2019
Signed-off-by lmignon
@OCA-git-bot
Copy link
Contributor

@lmignon your merge command was aborted due to failed check(s), which you can inspect on this commit of 13.0-ocabot-merge-pr-1704-by-lmignon-bump-no.

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.

@lmignon
Copy link
Sponsor Contributor

lmignon commented Oct 30, 2019

/ocabot merge

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 13.0-ocabot-merge-pr-1704-by-lmignon-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Oct 30, 2019
Signed-off-by lmignon
@OCA-git-bot OCA-git-bot merged commit d9df273 into OCA:13.0 Oct 30, 2019
@OCA-git-bot
Copy link
Contributor

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

None yet