Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented May 20, 2023

Forward-Port-Of: #4470
Forward-Port-Of: #4422

@robodoo
Copy link
Collaborator

robodoo commented May 20, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 20, 2023

@jcs-odoo cherrypicking of pull request #4422 failed.

stdout:

CONFLICT (file location): content/applications/finance/accounting/receivables/customer_invoices/electronic_invoicing/customer-form.png added in HEAD inside a directory that was renamed in 308cd72ee ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/customer_invoices/electronic_invoicing/customer-form.png.
CONFLICT (rename/delete): content/applications/finance/accounting/receivables/customer_invoices/electronic_invoicing/formats.png renamed to content/applications/finance/accounting/customer_invoices/electronic_invoicing/formats.png in 308cd72ee ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (file location): content/applications/finance/accounting/receivables/customer_invoices/electronic_invoicing/send-window.png added in HEAD inside a directory that was renamed in 308cd72ee ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/customer_invoices/electronic_invoicing/send-window.png.
CONFLICT (modify/delete): content/applications/finance/accounting/payables/pay.rst deleted in 308cd72ee ([MOV] accounting: restructuration of the accounting documentation) and modified in HEAD.  Version HEAD of content/applications/finance/accounting/payables/pay.rst left in tree.
CONFLICT (file location): content/applications/finance/accounting/payables/pay/trusted_accounts.rst added in HEAD inside a directory that was renamed in 308cd72ee ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/payments/trusted_accounts.rst.
CONFLICT (file location): content/applications/finance/accounting/payables/pay/trusted_accounts/send-money-toggle.png added in HEAD inside a directory that was renamed in 308cd72ee ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/payments/trusted_accounts/send-money-toggle.png.
Auto-merging content/applications/finance/fiscal_localizations.rst
Auto-merging content/applications/finance/payment_providers.rst
Auto-merging content/developer/howtos/accounting_localization.rst

stderr:

09:27:56.127288 git.c:455               trace: built-in: git cherry-pick 308cd72eebceacea7a70db11b63574bd04fe45d5
error: could not apply 308cd72ee... [MOV] accounting: restructuration of the accounting documentation
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.

@jcs-odoo jcs-odoo force-pushed the saas-16.2-15.0-accounting-structurepocalypse-jcs-XfTZ-fw branch from 705a21d to 774f6e4 Compare May 21, 2023 15:21
This commit improves the structure of the accounting documentation by
- reducing the levels necessary to reach the information
- grouping some docs
- moving content to their parent category page (content in all levels)
- renaming some sections to reflect the structure of the app better

task-3330093
@C3POdoo C3POdoo requested review from a team May 21, 2023 15:23
@jcs-odoo jcs-odoo removed request for a team May 21, 2023 15:24
@jcs-odoo jcs-odoo removed the request for review from a team May 21, 2023 15:24
@jcs-odoo
Copy link
Contributor

@robodoo r+ amigo

CharlesHoskinsonGIF

robodoo pushed a commit that referenced this pull request May 21, 2023
This commit improves the structure of the accounting documentation by
- reducing the levels necessary to reach the information
- grouping some docs
- moving content to their parent category page (content in all levels)
- renaming some sections to reflect the structure of the app better

task-3330093

closes #4477

Signed-off-by: Castillo Jonathan (jcs) <jcs@odoo.com>
@robodoo robodoo temporarily deployed to merge May 21, 2023 16:25 Inactive
@robodoo robodoo closed this May 21, 2023
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.

4 participants