Skip to content

Conversation

fw-bot
Copy link
Collaborator

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

Original Expenses doc too long, breaking off the logging expenses section into its own doc, and making necessary updates to version 17 (original was written for 16).

Project task card for this PR.

Forward-Port-Of: #10547
Forward-Port-Of: #10322

@robodoo
Copy link
Collaborator

robodoo commented Aug 5, 2024

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Aug 5, 2024

@larm-odoo @samueljlieber cherrypicking of pull request #10322 failed.

stdout:

Auto-merging content/applications/finance/expenses.rst
CONFLICT (content): Merge conflict in content/applications/finance/expenses.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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Aug 6, 2024

@larm-odoo @samueljlieber this forward port of #10322 is awaiting action (not merged or closed).

@larm-odoo larm-odoo force-pushed the saas-17.4-17.0-expenses-new-log-expenses-doc-larm-e9KB-fw branch from 790432c to c8645a7 Compare August 6, 2024 16:02
@C3POdoo C3POdoo requested a review from a team August 6, 2024 16:05
@larm-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Aug 6, 2024
closes #10611

X-original-commit: eb8643b
Signed-off-by: Samuel Lieber (sali) <sali@odoo.com>
Signed-off-by: Lara Martini (larm) <larm@odoo.com>
@robodoo robodoo closed this Aug 6, 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