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

[FW][I18N] add hr_hourly_cost to .tx/config #145044

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Dec 5, 2023

Somehow the module disappeared from the file between versions 16.0 and saas-16.1 even though the .po files exist (up to + including saas-16.2). Further investigation/fixing will occur later on to check overall consistency correctly, this commit is only a quick fix to get the translations working properly for this specific module.


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #144850
Forward-Port-Of: #144420

@robodoo
Copy link
Contributor

robodoo commented Dec 5, 2023

Pull request status dashboard.

@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 5, 2023

@ticodoo @oomsveta cherrypicking of pull request #144420 failed.

stdout:

Auto-merging .tx/config
CONFLICT (content): Merge conflict in .tx/config
Auto-merging addons/hr_hourly_cost/i18n/hr_hourly_cost.pot
CONFLICT (content): Merge conflict in addons/hr_hourly_cost/i18n/hr_hourly_cost.pot

stderr:

16:35:59.038019 git.c:463               trace: built-in: git cherry-pick f25be366af739a0843fa36342e2c6d36c7b05e1e
error: could not apply f25be366af73... [I18N] add hr_hourly_cost to .tx/config
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Dec 5, 2023
@C3POdoo C3POdoo added the RD research & development, internal work label Dec 5, 2023
Somehow the module disappeared from the file between versions 16.0 and
saas-16.1 even though the .po files exist (up to + including saas-16.2).
Further investigation/fixing will occur later on to check overall
consistency correctly, this commit is only a quick fix to get the
translations working properly for this specific module.

X-original-commit: d1dfb50
@ticodoo ticodoo force-pushed the 17.0-saas-16.1-i18n-hr-hourly-cost-tic-YRBZ-fw branch from 4bad808 to 9fb6b9f Compare December 5, 2023 16:26
@C3POdoo C3POdoo requested a review from a team December 5, 2023 16:28
@ticodoo
Copy link
Contributor

ticodoo commented Dec 5, 2023

@robodoo r+

@robodoo robodoo closed this in 692b1a2 Dec 6, 2023
@fw-bot fw-bot deleted the 17.0-saas-16.1-i18n-hr-hourly-cost-tic-YRBZ-fw branch December 20, 2023 00:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants