Skip to content

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Dec 23, 2024

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

task-4379148


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

Forward-Port-Of: #191416
Forward-Port-Of: #189967

@robodoo
Copy link
Contributor

robodoo commented Dec 23, 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 Dec 23, 2024
@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 23, 2024

@seifgneedy @jbw-odoo cherrypicking of pull request #189967 failed.

stdout:

Auto-merging addons/hr_expense/models/hr_expense_sheet.py
CONFLICT (content): Merge conflict in addons/hr_expense/models/hr_expense_sheet.py
Auto-merging addons/hr_expense/tests/test_expenses.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 Dec 23, 2024
@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 24, 2024

@seifgneedy @jbw-odoo this forward port of #189967 is awaiting action (not merged or closed).

…d entry

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

task-4379148

X-original-commit: 147701e
@seifgneedy seifgneedy force-pushed the saas-17.4-16.0-fix-bank-expense-segn-MrqA-fw branch from 75146f3 to 5176d2f Compare December 24, 2024 09:52
@seifgneedy
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Dec 24, 2024
…d entry

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

task-4379148

closes #191546

X-original-commit: 147701e
Signed-off-by: de Wouters de Bouchout Jean-Benoît (jbw) <jbw@odoo.com>
Signed-off-by: Seif Gneedy (segn) <segn@odoo.com>
@robodoo robodoo closed this Dec 24, 2024
@fw-bot fw-bot deleted the saas-17.4-16.0-fix-bank-expense-segn-MrqA-fw branch January 7, 2025 12:59
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