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] hr_expense: correct bank account in payment register wizard #162698

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Apr 19, 2024

To reproduce:

  • Add a bank account to Employee, and a bank account to your company.
  • Set the company on the employee's contact to yours.
  • Create an expense to be reimbursed to the employee, submit it and try to "Register Payment".

Current behaviour: the recipient bank account in the wizard is set to the company's.
Expected behaviour: the bank account in the wizard should be set to the employee's bank account.

This commit solves this.

task-3837305

Forward-Port-Of: #160749

@robodoo
Copy link
Contributor

robodoo commented Apr 19, 2024

Pull request status dashboard.

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 19, 2024

@alialfie @william-andre cherrypicking of pull request #160749 failed.

stdout:

Auto-merging addons/hr_expense/models/hr_expense_sheet.py
Auto-merging addons/hr_expense/tests/test_expenses.py
CONFLICT (content): Merge conflict in addons/hr_expense/tests/test_expenses.py

stderr:

20:30:59.086958 git.c:463               trace: built-in: git cherry-pick 26f73ac9bdc5dd90c9d5ab09f7c70aa9cd014136
error: could not apply 26f73ac9bdc5... [FIX] hr_expense: correct bank account in payment register wizard
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

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Apr 19, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Apr 19, 2024
@alialfie alialfie force-pushed the saas-17.1-17.0-fix_expense_bank_account-alal-aUDF-fw branch from 2ef3c12 to 32ba216 Compare April 22, 2024 12:37
To reproduce:
* Add a bank account to Employee, and a bank account to your company.
* Set the company on the employee's contact to yours.
* Create an expense to be reimbursed to the employee, submit it and try
to "Register Payment".

Current behaviour: the recipient bank account in the wizard is set to
the company's.
Expected behaviour: the bank account in the wizard should be set to the
employee's bank account.

This commit solves this.

task-3837305

X-original-commit: 1ed71ba
@william-andre
Copy link
Contributor

@robodoo r/

@william-andre
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 23, 2024
To reproduce:
* Add a bank account to Employee, and a bank account to your company.
* Set the company on the employee's contact to yours.
* Create an expense to be reimbursed to the employee, submit it and try
to "Register Payment".

Current behaviour: the recipient bank account in the wizard is set to
the company's.
Expected behaviour: the bank account in the wizard should be set to the
employee's bank account.

This commit solves this.

task-3837305

closes #162698

X-original-commit: 1ed71ba
Signed-off-by: William André (wan) <wan@odoo.com>
@robodoo robodoo closed this Apr 23, 2024
@fw-bot fw-bot deleted the saas-17.1-17.0-fix_expense_bank_account-alal-aUDF-fw branch May 7, 2024 16: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

5 participants