Skip to content

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Nov 22, 2024

For an expense report paid by an employee, the bank account should be set on the employee form and be used to create the Journal Entry and in Register Payment Wizard.

enterprise: https://github.com/odoo/enterprise/pull/71080

task-4206895


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

Forward-Port-Of: #181870

@robodoo
Copy link
Contributor

robodoo commented Nov 22, 2024

Pull request status dashboard

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

fw-bot commented Nov 22, 2024

@seifgneedy @oco-odoo cherrypicking of pull request #181870 failed.

stdout:

Auto-merging addons/hr_expense/i18n/hr_expense.pot
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/hr_expense.pot
Auto-merging addons/hr_expense/models/hr_expense.py
CONFLICT (content): Merge conflict in addons/hr_expense/models/hr_expense.py
Auto-merging addons/hr_expense/tests/common.py
CONFLICT (content): Merge conflict in addons/hr_expense/tests/common.py

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 Nov 22, 2024
@seifgneedy seifgneedy force-pushed the 17.0-16.0-fix-expense-bank-acc-segn-zeBJ-fw branch 3 times, most recently from fea7ce9 to 1362e01 Compare November 25, 2024 09:50
@C3POdoo C3POdoo requested a review from a team November 25, 2024 09:53
For an expense report paid by an employee, the bank account should be set on the employee form and be used to create the Journal Entry and in Register Payment Wizard.

task-4206895

X-original-commit: 063e224
@seifgneedy seifgneedy force-pushed the 17.0-16.0-fix-expense-bank-acc-segn-zeBJ-fw branch from 1362e01 to 7cd923f Compare November 25, 2024 12:59
@seifgneedy
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Nov 25, 2024
For an expense report paid by an employee, the bank account should be set on the employee form and be used to create the Journal Entry and in Register Payment Wizard.

task-4206895

closes #188210

X-original-commit: 063e224
Related: odoo/enterprise#74363
Signed-off-by: Olivier Colson (oco) <oco@odoo.com>
Signed-off-by: Seif Gneedy (segn) <segn@odoo.com>
@robodoo robodoo closed this Nov 25, 2024
@fw-bot fw-bot deleted the 17.0-16.0-fix-expense-bank-acc-segn-zeBJ-fw branch December 9, 2024 22:18
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.

4 participants