Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented May 9, 2022

Forward-Port-Of: #1948
Forward-Port-Of: #1334

@robodoo
Copy link
Collaborator

robodoo commented May 9, 2022

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 9, 2022

Ping @william-andre, @AntoineVDV cherrypicking of pull request #1334 failed.

stderr:

11:14:09.364879 git.c:344               trace: built-in: git cherry-pick 18ec9342908f0b586c4d6fad5dde6c479705eacf
error: Cherry-picking is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: cherry-pick failed
----------
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.

@AntoineVDV AntoineVDV force-pushed the saas-15.2-15.0-accounting-localization--IEL-wan-d69d-fw branch from 37322ee to 9836211 Compare May 9, 2022 09:55
@C3POdoo C3POdoo requested review from a team May 9, 2022 10:01
@AntoineVDV AntoineVDV removed request for a team May 9, 2022 10:04
william-andre and others added 4 commits May 9, 2022 12:05
Also add a condition on some directives to ignore them when we have no
relative/absolute path.
This new directive is generating documentation from Odoo fields. This
can be used to build documentation about business classes.
This will help developpers import/export data and build localization
modules for instance.
Co-authored-by: William Andre <wan@odoo.com>
Co-authored-by: Ivan Yelizariev <iel@odoo.com>
@AntoineVDV AntoineVDV force-pushed the saas-15.2-15.0-accounting-localization--IEL-wan-d69d-fw branch from 9836211 to 3dcb087 Compare May 9, 2022 10:06
@AntoineVDV
Copy link
Collaborator

@robodoo r+ rebase-ff

@robodoo
Copy link
Collaborator

robodoo commented May 9, 2022

Merge method set to rebase and fast-forward

robodoo pushed a commit that referenced this pull request May 9, 2022
Also add a condition on some directives to ignore them when we have no
relative/absolute path.

Part-of: #1956
robodoo pushed a commit that referenced this pull request May 9, 2022
This new directive is generating documentation from Odoo fields. This
can be used to build documentation about business classes.
This will help developpers import/export data and build localization
modules for instance.

Part-of: #1956
robodoo pushed a commit that referenced this pull request May 9, 2022
robodoo pushed a commit that referenced this pull request May 9, 2022
closes #1956

Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Co-authored-by: William Andre <wan@odoo.com>
Co-authored-by: Ivan Yelizariev <iel@odoo.com>
@william-andre
Copy link
Contributor

❤️

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.

5 participants