Skip to content

Conversation

fw-bot
Copy link
Collaborator

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

This PR improves the content of the Colombian localization documentation by adding additional context to most sections per #4425.

This PR can be FWP with small edits needed for 15.0 and 16.0.

Forward-Port-Of: #5936

@robodoo
Copy link
Collaborator

robodoo commented Nov 22, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 22, 2023

@samueljlieber @StraubCreative cherrypicking of pull request #5936 failed.

stdout:

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

stderr:

22:37:49.889031 git.c:463               trace: built-in: git cherry-pick a359dfefabe07cf2877fc389ad941d97ec49f31e
error: could not apply a359dfefa... [IMP] accounting/l10n_co: additional context
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.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

X-original-commit: e643e0f
Co-authored-by: dade-odoo <87431108+dade-odoo@users.noreply.github.com>
Co-authored-by: larm-odoo <121518652+larm-odoo@users.noreply.github.com>
@samueljlieber samueljlieber force-pushed the 15.0-14.0-l10n_co-additional-context-imp-sali-QtI6-fw branch from 6b1c408 to cbfb252 Compare November 27, 2023 20:34
@C3POdoo C3POdoo requested a review from a team November 27, 2023 20:35
@samueljlieber
Copy link
Contributor

Resolved merge conflict in cbfb252

@samueljlieber
Copy link
Contributor

@robodoo retry

@robodoo
Copy link
Collaborator

robodoo commented Nov 27, 2023

I'm sorry, @samueljlieber: retry makes no sense when the PR is not in error.

@samueljlieber
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Nov 27, 2023
closes #6573

X-original-commit: e643e0f
Signed-off-by: Zachary Straub (zst) <zst@odoo.com>
Signed-off-by: Samuel Lieber (sali) <sali@odoo.com>
Co-authored-by: dade-odoo <87431108+dade-odoo@users.noreply.github.com>
Co-authored-by: larm-odoo <121518652+larm-odoo@users.noreply.github.com>
@robodoo robodoo closed this Nov 27, 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.

3 participants