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][FIX] sale_timesheet: currency displayed in project mapping #159588

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 27, 2024

This commit's purpose is to display the correct currency for the hourly
cost of employee in the project sol mapping.
Currently, the currency displayed is the one of the sol instead of the
currency of the employee. This is due to this commit:83760b9
We added a monetary widget, but we are feeding it the wrong id.

After this commit, the correct currency is displayed

task - 3749225

Forward-Port-Of: #154240

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 27, 2024
@robodoo
Copy link
Contributor

robodoo commented Mar 27, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 27, 2024

@damrOdoo @xavierbol cherrypicking of pull request #154240 failed.

stdout:

Auto-merging addons/sale_timesheet/views/project_task_views.xml
CONFLICT (content): Merge conflict in addons/sale_timesheet/views/project_task_views.xml

stderr:

22:31:57.213017 git.c:463               trace: built-in: git cherry-pick 1b867cf4bfc490c7054e40f5daee58905cbdc2f5
error: could not apply 1b867cf4bfc4... [FIX] sale_timesheet: currency displayed in project mapping
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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

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

@C3POdoo C3POdoo added the RD research & development, internal work label Mar 27, 2024
This commit's purpose is to display the correct currency for the hourly
cost of employee in the project sol mapping.
Currently, the currency displayed is the one of the sol instead of the
currency of the employee. This is due to this commit:odoo@83760b9
We added a monetary widget, but we are feeding it the wrong id.

After this commit, the correct currency is displayed

X-original-commit: 8603d62
@damrOdoo damrOdoo force-pushed the 17.0-16.0-fix-display-correct-currency-in-employee-mapping-damr-F2Ql-fw branch from b1e1720 to 1138f1f Compare March 28, 2024 09:51
@C3POdoo C3POdoo requested a review from a team March 28, 2024 09:59
Copy link
Contributor

@xavierbol xavierbol left a comment

Choose a reason for hiding this comment

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

robodoo r+

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

5 participants