[FW][IMP] Inventory: updating second person and images, add clarity

[fw-bot]

Updating images, adding more detail, rewriting to remove the second person.

Forward-Port-Of: #3787

[robodoo]

Pull request status dashboard.

[fw-bot]

@larm-odoo @Felicious cherrypicking of pull request #3787 failed.

stdout:

Auto-merging content/applications/inventory_and_mrp/inventory/management/products/uom.rst
CONFLICT (content): Merge conflict in content/applications/inventory_and_mrp/inventory/management/products/uom.rst
Auto-merging content/applications/inventory_and_mrp/inventory/management/products/usage.rst
CONFLICT (content): Merge conflict in content/applications/inventory_and_mrp/inventory/management/products/usage.rst
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/management/products/usage/usage_06.png renamed to content/applications/inventory_and_mrp/inventory/management/products/usage/delivery-package-details.png in HEAD, but deleted in 91ac8bb6a ([IMP] Inventory: updating second person and images, add clarity).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/management/products/usage/usage_08.png renamed to content/applications/inventory_and_mrp/inventory/management/products/usage/package-field-on-po.png in HEAD, but deleted in 91ac8bb6a ([IMP] Inventory: updating second person and images, add clarity).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/management/products/usage/usage_07.png renamed to content/applications/inventory_and_mrp/inventory/management/products/usage/product-packaging-examples.png in HEAD, but deleted in 91ac8bb6a ([IMP] Inventory: updating second person and images, add clarity).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/management/products/usage/usage_05.png renamed to content/applications/inventory_and_mrp/inventory/management/products/usage/separate-delivery-into-different-packages.png in HEAD, but deleted in 91ac8bb6a ([IMP] Inventory: updating second person and images, add clarity).

stderr:

00:28:03.062672 git.c:455               trace: built-in: git cherry-pick 91ac8bb6a7e9a0d01a28e44d3be993f81756bab7
error: could not apply 91ac8bb6a... [IMP] Inventory: updating second person and images, add clarity
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

[Felicious]

@samueljlieber Not sure why there's a conflict 😭 I wasn't sure about how to go about fixing this.

[samueljlieber]

Fixed merge conflict due to previous 15.0 edits to uom.rst and usage.rst. Resolving the conflict involved replacing the previous content in usage.rst with the improved content in this PR and adding a custom anchor to the uom.rst doc.

[Felicious]

@robodoo r+