[FW][IMP] barcode: split docs + hone in on language

[fw-bot]

Summary

Improve wording about GS1 barcode concepts.

• Received feedback from CRU about barcode conceptual accuracy and changed the wording to reflect it
• Created scannable 2D matrix barcodes (they look like QR codes) for readers to try scanning!
• Received feedback from hojo to split the docs into two so it's easier for readers to search for GS1 nomenclature (setup) vs. using GS1 barcodes in their warehouse workflow.
• Received feedback from ZST about honing in on language surrounding creating GS1 barcodes. Need to make it very clear that Odoo doesn't generate GS1 barcodes for users! We just take in their inputs. Can reviewers make sure that my doc makes this very clear? (:

Thanks 😸

Forward-Port-Of: #5592

[robodoo]

Pull request status dashboard.

[fw-bot]

@Felicious @StraubCreative cherrypicking of pull request #5592 failed.

stdout:

Auto-merging content/applications/inventory_and_mrp/barcode/operations.rst
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/barcode-field.png renamed to content/applications/inventory_and_mrp/barcode/operations/gs1_nomenclature/barcode-field.png in HEAD, but deleted in 89824edc0 ([IMP] barcode: split docs + hone in on language).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/edit-lot-quantities.png renamed to content/applications/inventory_and_mrp/barcode/operations/gs1_nomenclature/edit-lot-quantities.png in HEAD, but deleted in 89824edc0 ([IMP] barcode: split docs + hone in on language).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/scan-apple-lot-number.png renamed to content/applications/inventory_and_mrp/barcode/operations/gs1_nomenclature/scan-apple-lot-number.png in HEAD, but deleted in 89824edc0 ([IMP] barcode: split docs + hone in on language).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/scan-barcode-peaches.png renamed to content/applications/inventory_and_mrp/barcode/operations/gs1_nomenclature/scan-barcode-peaches.png in HEAD, but deleted in 89824edc0 ([IMP] barcode: split docs + hone in on language).
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_usage.rst added in 89824edc0 ([IMP] barcode: split docs + hone in on language) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/gs1_usage.rst.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_usage/barcode-field.png added in 89824edc0 ([IMP] barcode: split docs + hone in on language) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/barcode-field.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_usage/fuji-apples-barcode.png added in 89824edc0 ([IMP] barcode: split docs + hone in on language) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/fuji-apples-barcode.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_usage/peaches-barcode.png added in 89824edc0 ([IMP] barcode: split docs + hone in on language) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/peaches-barcode.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/product-barcodes-page.png renamed to content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_usage/product-barcodes-page.png in 89824edc0 ([IMP] barcode: split docs + hone in on language), inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/product-barcodes-page.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/receive-50-apples.png renamed to content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_usage/receive-50-apples.png in 89824edc0 ([IMP] barcode: split docs + hone in on language), inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/receive-50-apples.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_usage/scan-barcode-peaches.png added in 89824edc0 ([IMP] barcode: split docs + hone in on language) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/scan-barcode-peaches.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/stock-moves-peach.png renamed to content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_usage/stock-moves-peach.png in 89824edc0 ([IMP] barcode: split docs + hone in on language), inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/stock-moves-peach.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/track-by-lots.png renamed to content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_usage/track-by-lots.png in 89824edc0 ([IMP] barcode: split docs + hone in on language), inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/track-by-lots.png.
CONFLICT (rename/rename): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/product-barcodes-page.png renamed to content/applications/inventory_and_mrp/barcode/operations/gs1_nomenclature/product-barcodes-page.png in HEAD and to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/product-barcodes-page.png in 89824edc0 ([IMP] barcode: split docs + hone in on language).
CONFLICT (rename/rename): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/receive-50-apples.png renamed to content/applications/inventory_and_mrp/barcode/operations/gs1_nomenclature/receive-50-apples.png in HEAD and to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/receive-50-apples.png in 89824edc0 ([IMP] barcode: split docs + hone in on language).
CONFLICT (rename/rename): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/stock-moves-peach.png renamed to content/applications/inventory_and_mrp/barcode/operations/gs1_nomenclature/stock-moves-peach.png in HEAD and to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/stock-moves-peach.png in 89824edc0 ([IMP] barcode: split docs + hone in on language).
CONFLICT (rename/rename): content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_nomenclature/track-by-lots.png renamed to content/applications/inventory_and_mrp/barcode/operations/gs1_nomenclature/track-by-lots.png in HEAD and to content/applications/inventory_and_mrp/barcode/operations/gs1_usage/track-by-lots.png in 89824edc0 ([IMP] barcode: split docs + hone in on language).

stderr:

00:27:20.998733 git.c:463               trace: built-in: git cherry-pick 89824edc06e469ea19a07c6a0ff70e52e76cce9e
error: could not apply 89824edc0... [IMP] barcode: split docs + hone in on language
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]

Resolved merge conflicts, @StraubCreative ! This PR is ready for you to try to merge again 😄

[StraubCreative]

@robodoo r+