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

[13.0][MIG] disable_odoo_online #15

Merged
merged 14 commits into from
Apr 16, 2020
Merged

[13.0][MIG] disable_odoo_online #15

merged 14 commits into from
Apr 16, 2020

Conversation

tarteo
Copy link
Member

@tarteo tarteo commented Dec 6, 2019

No description provided.

tungocbui and others added 13 commits December 6, 2019 13:25
@tungocbui @tarteo
[FIX] Rename the module disable_openerp_online to disable_odoo_online…
0120f99 
…. Update the version in the file __openerp__.py
@legalsylvain @tarteo
[PORT] disable_odoo_online. [REF] remove obsolete code. OCA conventio…
ec6765e 
…n. (#583)

* [PORT] disable_odoo_online. [REF] remove obsolete code. OCA convention.

* [FIX] restauring old feature

* [IMP] do not disable some feature for Enterprise Edition. [REF] some improvements
@hieulucky111 @tarteo
[MIG] Disable_odoo_online: Migration to 11.0
aaf046d
@tarteo
disable_odoo_online: make it clear in README, that feature works in o…
4614375 
…doo community only (OCA#4)

* [DOC] disable_odoo_online: clarify docs

-- one of the features is applied only in odoo community
@aldo774 @tarteo
Refactor in customized template and alter menu app location (OCA#3)
0b35bca 
* [REF] Changes template used to modificate user preferences menu
* [IMP] Includes app menu from settings in technical parameters menu
@eLBati @tarteo
porting disable_odoo_online to 12
778fca8
@oca-travis @tarteo
[UPD] Update disable_odoo_online.pot
54d1523
@gurneyalex @tarteo
Translated using Weblate (French)
0147737 
Currently translated at 100.0% (1 of 1 strings)

Translation: server-brand-12.0/server-brand-12.0-disable_odoo_online
Translate-URL: https://translation.odoo-community.org/projects/server-brand-12-0/server-brand-12-0-disable_odoo_online/fr/
@mvrodriguez @tarteo
Translated using Weblate (Spanish)
0fe65f8 
Currently translated at 100.0% (1 of 1 strings)

Translation: server-brand-12.0/server-brand-12.0-disable_odoo_online
Translate-URL: https://translation.odoo-community.org/projects/server-brand-12-0/server-brand-12-0-disable_odoo_online/es/
@OCA-git-bot @tarteo
[UPD] README.rst
9a02057
@tarteo
Translated using Weblate (Portuguese (Brazil))
743bddd 
Currently translated at 100.0% (1 of 1 strings)

Translation: server-brand-12.0/server-brand-12.0-disable_odoo_online
Translate-URL: https://translation.odoo-community.org/projects/server-brand-12-0/server-brand-12-0-disable_odoo_online/pt_BR/
@badbole @tarteo
Translated using Weblate (Croatian)
7a1d859 
Currently translated at 100.0% (1 of 1 strings)

Translation: server-brand-12.0/server-brand-12.0-disable_odoo_online
Translate-URL: https://translation.odoo-community.org/projects/server-brand-12-0/server-brand-12-0-disable_odoo_online/hr/
@tarteo
[IMP] disable_odoo_online: black, isort
6332604
@pedrobaeza pedrobaeza added this to the 13.0 milestone Dec 6, 2019
@OCA-git-bot OCA-git-bot mentioned this pull request Dec 6, 2019
Closed
2 tasks
@tarteo tarteo force-pushed the 13.0-mig-disable_odoo_online branch 3 times, most recently from b903549 to 6a5d171 Compare December 20, 2019 10:47
@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Mar 15, 2020
@OCA-git-bot
Merge PR #15 into 13.0
d8a3118 
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 13.0-ocabot-merge-pr-15-by-pedrobaeza-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.

@pedrobaeza
Copy link
Member

Can you please rebase and pass pre-commit?

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

mileo pushed a commit to kmee/server-brand that referenced this pull request Mar 31, 2020
@bwrsandman @legalsylvain
Tighten type check in domain
38b7b7c 
Fixes OCA#15
Check that `domain[2]` is `str` because in some cases it's an `int` and `list`
operations don't work on `int`s.
@mileo mileo mentioned this pull request Mar 31, 2020
Closed
@tarteo
Copy link
Member Author

tarteo commented Apr 16, 2020

Can this be merged?

@pedrobaeza
Copy link
Member

Have you rebased?

@tarteo
Copy link
Member Author

tarteo commented Apr 16, 2020

Yes

@tarteo
Copy link
Member Author

tarteo commented Apr 16, 2020

Atleast the migration commit is rebased.

@pedrobaeza
Copy link
Member

Let's see if it works

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Apr 16, 2020
@OCA-git-bot
Merge PR #15 into 13.0
9f08f3f 
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 13.0-ocabot-merge-pr-15-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

Coming back to #15 (comment) then.

@tarteo tarteo force-pushed the 13.0-mig-disable_odoo_online branch from 6a5d171 to fde407a Compare April 16, 2020 12:31
@tarteo
Copy link
Member Author

tarteo commented Apr 16, 2020

@pedrobaeza fixed it, let see if it passes.

@tarteo tarteo force-pushed the 13.0-mig-disable_odoo_online branch from fde407a to cbbcd96 Compare April 16, 2020 12:35
@tarteo
[MIG] disable_odoo_online: Migration to 13.0
3e476b1 
[FIX] pre-commit

[FIX] Remove use of api.multi

[FIX] pre-commit

[FIX] pre-commit

[FIX] pre-commit

[FIX] pre-commit
@tarteo tarteo force-pushed the 13.0-mig-disable_odoo_online branch from cbbcd96 to 3e476b1 Compare April 16, 2020 12:40
@tarteo
Copy link
Member Author

tarteo commented Apr 16, 2020

@pedrobaeza Can you retry, please.

@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

Hi @pedrobaeza. Your command failed:

Required option bumpversion_mode for command merge. Possible values : major, minor, patch, nobump.

Ocabot commands

  • ocabot merge major|minor|patch|nobump

More information

@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

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

@OCA-git-bot OCA-git-bot merged commit 71a5ca8 into OCA:13.0 Apr 16, 2020
@OCA-git-bot
Copy link
Contributor

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

@dreispt dreispt dreispt approved these changes

@pedrobaeza pedrobaeza pedrobaeza approved these changes

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

Successfully merging this pull request may close these issues.

None yet