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

[16.0][MIG] hr_holidays_settings #120

Merged
merged 42 commits into from
Sep 9, 2024

Conversation

JasminSForgeFlow
Copy link

Standard Migration

@ForgeFlow

MiquelRForgeFlow and others added 30 commits May 24, 2024 15:29
OCA Transbot updated translations from Transifex

OCA Transbot updated translations from Transifex

OCA Transbot updated translations from Transifex
Currently translated at 100.0% (4 of 4 strings)

Translation: hr-11.0/hr-11.0-hr_holidays_settings
Translate-URL: https://translation.odoo-community.org/projects/hr-11-0/hr-11-0-hr_holidays_settings/fa/
Currently translated at 100,0% (4 of 4 strings)

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

Translation: hr-12.0/hr-12.0-hr_holidays_settings
Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_holidays_settings/
Currently translated at 100.0% (4 of 4 strings)

Translation: hr-12.0/hr-12.0-hr_holidays_settings
Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_holidays_settings/es/
Currently translated at 75.0% (3 of 4 strings)

Translation: hr-12.0/hr-12.0-hr_holidays_settings
Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_holidays_settings/fr/
Currently translated at 100.0% (4 of 4 strings)

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

Translation: hr-12.0/hr-12.0-hr_holidays_settings
Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_holidays_settings/
Currently translated at 100.0% (3 of 3 strings)

Translation: hr-holidays-13.0/hr-holidays-13.0-hr_holidays_settings
Translate-URL: https://translation.odoo-community.org/projects/hr-holidays-13-0/hr-holidays-13-0-hr_holidays_settings/ca/
Copy link

@AaronHForgeFlow AaronHForgeFlow left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@MiquelRForgeFlow MiquelRForgeFlow left a comment

Choose a reason for hiding this comment

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

LGTM

#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"Project-Id-Version: Odoo Server 14.0\n"
"Project-Id-Version: Odoo Server 16.0\n"

<field name="res_model">res.config.settings</field>
<field name="view_mode">form</field>
<field name="target">inline</field>
<field name="context">{'module' : 'hr_holidays'}</field>
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
<field name="context">{'module' : 'hr_holidays'}</field>
<field name="context">{'module': 'hr_holidays'}</field>

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

@JordiBForgeFlow
Copy link
Member

@pedrobaeza @Shide can you merge this PR?

@pedrobaeza
Copy link
Member

/ocabot migration hr_holidays_settings
/ocabot merge nobump

@OCA-git-bot OCA-git-bot added this to the 16.0 milestone Sep 9, 2024
@OCA-git-bot
Copy link
Contributor

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

@OCA-git-bot OCA-git-bot merged commit e4dcc59 into OCA:16.0 Sep 9, 2024
6 of 7 checks passed
@OCA-git-bot
Copy link
Contributor

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

@MiquelRForgeFlow MiquelRForgeFlow deleted the 16.0-mig-hr_holidays_settings branch September 9, 2024 17:31
@gjotten
Copy link

gjotten commented Sep 10, 2024

@JordiBForgeFlow @pedrobaeza I am now confronted with failing builds:

AddonsConfigError: Addon hr_holidays_settings defined in several repos {'OCA/hr-holidays', 'OCA/hr'}

OCA/hr#1244 added the module to the hr repo; here we introduce it a second time. Looks like one place too many.

@pedrobaeza
Copy link
Member

Deleting it in OCA/hr#1391

@OCA-git-bot OCA-git-bot mentioned this pull request Sep 17, 2024
7 tasks
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.