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

[MIG] product_brand_stock: Migrate to 15.0 from 16.0 #189

Merged
merged 7 commits into from
Feb 16, 2024
Merged

[MIG] product_brand_stock: Migrate to 15.0 from 16.0 #189

merged 7 commits into from
Feb 16, 2024

Conversation

VEscaname
Copy link

No description provided.

@VEscaname VEscaname force-pushed the 15.0-mig-product_brand_stock branch 2 times, most recently from fb5e1d2 to 15dd9df Compare February 9, 2024 14:27
@VEscaname
Copy link
Author

@hugho-ad @luisg123v Could you review this PR please?

hugho-ad
hugho-ad reviewed Feb 9, 2024
View reviewed changes
product_brand_stock/i18n/product_brand_stock.pot
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
Copy link

Choose a reason for hiding this comment

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

15.0

Copy link
Author

Choose a reason for hiding this comment

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

Done

@VEscaname VEscaname force-pushed the 15.0-mig-product_brand_stock branch from 15dd9df to d12bc91 Compare February 9, 2024 17:57
@hugho-ad
Copy link

@moylop260

could you review please?

luisg123v
luisg123v suggested changes Feb 12, 2024
View reviewed changes
Copy link

@luisg123v luisg123v left a comment

Choose a reason for hiding this comment

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

Commit title:

migration -> migrate

Because titles should be in imperative tense.

setup/product_brand_stock/odoo/addons/product_brand_stock
@@ -0,0 +1 @@
../../../../product_brand_stock
Copy link

Choose a reason for hiding this comment

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

This shouldn't be here in the migration commit but in the precommit commit.

BTW, since title is not only for autoformatting but also for things like these ones, title should be:

[IMP] module_name: pre-commit stuff

(according to OCA guidelines).

Copy link

Choose a reason for hiding this comment

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

pre-commit-stuff -> pre-commit stuff (remove extra "-").

product_brand_stock/__init__.py
query_alter = sql.SQL("ALTER TABLE {} ADD COLUMN IF NOT EXISTS product_brand_id integer").format(
sql.Identifier(to_init_table)
)
query_alter = sql.SQL(
Copy link

Choose a reason for hiding this comment

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

This is reverting what was done in previous commit (the precommit one).

product_brand_stock/i18n/es.po Outdated
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Project-Id-Version: Odoo Server 15.0\n"
Copy link

Choose a reason for hiding this comment

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

You're changing this one but not modifying the template.

Either change bot or leave both untouched (they will be updated by the bot anyway).

@VEscaname VEscaname force-pushed the 15.0-mig-product_brand_stock branch 2 times, most recently from f21e873 to af736a8 Compare February 13, 2024 14:45
@VEscaname VEscaname changed the title [MIG] product_brand_stock: Migration to 15.0 from 16.0 [MIG] product_brand_stock: Migrateto 15.0 from 16.0 Feb 13, 2024
@VEscaname VEscaname changed the title [MIG] product_brand_stock: Migrateto 15.0 from 16.0 [MIG] product_brand_stock: Migrate to 15.0 from 16.0 Feb 13, 2024
@VEscaname VEscaname force-pushed the 15.0-mig-product_brand_stock branch from af736a8 to 5cbfde7 Compare February 13, 2024 15:05
@VEscaname
Copy link
Author

@luisg123v Could you please review this again?

@VEscaname VEscaname force-pushed the 15.0-mig-product_brand_stock branch from 5cbfde7 to e4950f5 Compare February 14, 2024 22:47
luisg123v
luisg123v approved these changes Feb 14, 2024
View reviewed changes
Copy link

@luisg123v luisg123v left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@luisg123v
Copy link

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Sorry @luisg123v you are not allowed to merge.

To do so you must either have push permissions on the repository, or be a declared maintainer of all modified addons.

If you wish to adopt an addon and become it's maintainer, open a pull request to add your GitHub login to the maintainers key of its manifest.

@luisg123v
Copy link

Hi @moylop260,

I can't merge this one.

Could you merge it, please?

Regards,

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

@moylop260
Copy link

/ocabot merge nobump

@moylop260
Copy link

/ocabot merge nobump

@moylop260 moylop260 merged commit fcc18ed into OCA:15.0 Feb 16, 2024
7 checks passed
@moylop260 moylop260 deleted the 15.0-mig-product_brand_stock branch February 16, 2024 03:07
@OCA-git-bot
Copy link
Contributor

@moylop260 The merge process could not start, because command `git merge --no-ff -m 'Merge PR #189 into 15.0

Signed-off-by moylop260' tmp-pr-189` failed with output:

CONFLICT (add/add): Merge conflict in product_brand_stock/static/description/index.html
Auto-merging product_brand_stock/static/description/index.html
CONFLICT (add/add): Merge conflict in product_brand_stock/i18n/product_brand_stock.pot
Auto-merging product_brand_stock/i18n/product_brand_stock.pot
CONFLICT (add/add): Merge conflict in product_brand_stock/README.rst
Auto-merging product_brand_stock/README.rst
Automatic merge failed; fix conflicts and then commit the result.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@luisg123v luisg123v luisg123v approved these changes

@hugho-ad hugho-ad hugho-ad approved these changes

Assignees
No one assigned
Labels
approved ready to merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@VEscaname @hugho-ad @luisg123v @OCA-git-bot @moylop260 @OpenCode @Ivorra78