Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Aug 7, 2024

Original Expenses doc too long, breaking off the reimbursing expenses  to accounting section into its own doc, and making necessary updates to version 17 (original was written for 16). Also updating per new doc guidelines.

Project task card for this PR.

Forward-Port-Of: #10393

@robodoo
Copy link
Collaborator

robodoo commented Aug 7, 2024

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Aug 7, 2024

@larm-odoo cherrypicking of pull request #10393 failed.

stdout:

Auto-merging content/applications/finance/expenses.rst
CONFLICT (content): Merge conflict in content/applications/finance/expenses.rst
Auto-merging content/applications/finance/expenses/expense_reports.rst
CONFLICT (content): Merge conflict in content/applications/finance/expenses/expense_reports.rst

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

@larm-odoo larm-odoo force-pushed the saas-17.1-17.0-expenses-reimburse-employees-larm-F7cH-fw branch from 532faa2 to 13d0d6c Compare August 8, 2024 14:10
@larm-odoo larm-odoo force-pushed the saas-17.1-17.0-expenses-reimburse-employees-larm-F7cH-fw branch from 13d0d6c to 805bca0 Compare August 8, 2024 14:54
@C3POdoo C3POdoo requested a review from a team August 8, 2024 14:56
@larm-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Aug 8, 2024
closes #10639

X-original-commit: c1d5ddc
Signed-off-by: Lara Martini (larm) <larm@odoo.com>
@robodoo robodoo closed this Aug 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants