Skip to content

Conversation

@fw-bot
Copy link
Collaborator

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

This PR adds a new doc about how to create locations and location hierarchies.

Forward-Port-Of: #3843

@robodoo
Copy link
Collaborator

robodoo commented Nov 10, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 10, 2023

@hojo-odoo @StraubCreative cherrypicking of pull request #3843 failed.

stdout:

Auto-merging content/applications/inventory_and_mrp/inventory/management/warehouses.rst
Auto-merging content/applications/inventory_and_mrp/inventory/routes/strategies/removal.rst
CONFLICT (content): Merge conflict in content/applications/inventory_and_mrp/inventory/routes/strategies/removal.rst

stderr:

19:09:34.288948 git.c:463               trace: built-in: git cherry-pick a7a577d455e5ac18cb57a202ec0c7ea34970a9d6
error: could not apply a7a577d45... [ADD] Inventory: Use locations to manage inventory
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

@StraubCreative StraubCreative force-pushed the 15.0-14.0-inventory-add-use-locations-hojo-Yn0y-fw branch from 6e45439 to c11d3c4 Compare November 10, 2023 22:33
@C3POdoo C3POdoo requested a review from a team November 10, 2023 22:35
@StraubCreative StraubCreative force-pushed the 15.0-14.0-inventory-add-use-locations-hojo-Yn0y-fw branch from c11d3c4 to c9b024d Compare November 10, 2023 22:42
@StraubCreative StraubCreative force-pushed the 15.0-14.0-inventory-add-use-locations-hojo-Yn0y-fw branch from c9b024d to 9d9b829 Compare November 10, 2023 22:53
@StraubCreative
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Nov 10, 2023
closes #6406

Signed-off-by: Zachary Straub (zst) <zst@odoo.com>
@robodoo
Copy link
Collaborator

robodoo commented Nov 11, 2023

@hojo-odoo @StraubCreative staging failed: ci/runbot on 3a5b18ee8c9c34a30583bda87e0858cb3f31bc6d (view more at https://runbot.odoo.com/runbot/build/53606727)

@StraubCreative
Copy link
Contributor

@robodoo retry

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