Skip to content

Conversation

@fw-bot
Copy link
Collaborator

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

This PR is an [IMP] targeting the previously-named internal doc in Odoo's Inventory/Barcode documentation.

Performed complete rewrite to the document for 15.0 to be fwd-ported (targeted revision for 16.0 to follow).

  • Completely rewrote the .rst file
  • Replaced/added screenshots where appropriate
  • Rewrote and added to doc to make more robust and comprehensive than before

ALSO performed a [REF] on this doc: renamed to receipts_deliveries to more accurately reflect the content of the doc. Added a redirect in the .txt file to account for this

Forward-Port-Of: #5559

@robodoo
Copy link
Collaborator

robodoo commented Dec 22, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 22, 2023

@brse-odoo @StraubCreative cherrypicking of pull request #5559 failed.

stdout:

Auto-merging content/applications/inventory_and_mrp/barcode/operations.rst
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/internal.rst renamed to content/applications/inventory_and_mrp/barcode/operations/internal.rst in HEAD, but deleted in 07170fb45 ([IMP] barcode: update barcode operations doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/internal/internal_01.png renamed to content/applications/inventory_and_mrp/barcode/operations/internal/internal_01.png in HEAD, but deleted in 07170fb45 ([IMP] barcode: update barcode operations doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/internal/internal_02.png renamed to content/applications/inventory_and_mrp/barcode/operations/internal/internal_02.png in HEAD, but deleted in 07170fb45 ([IMP] barcode: update barcode operations doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/internal/internal_03.png renamed to content/applications/inventory_and_mrp/barcode/operations/internal/internal_03.png in HEAD, but deleted in 07170fb45 ([IMP] barcode: update barcode operations doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/internal/internal_04.png renamed to content/applications/inventory_and_mrp/barcode/operations/internal/internal_04.png in HEAD, but deleted in 07170fb45 ([IMP] barcode: update barcode operations doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/internal/internal_05.png renamed to content/applications/inventory_and_mrp/barcode/operations/internal/internal_05.png in HEAD, but deleted in 07170fb45 ([IMP] barcode: update barcode operations doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/internal/internal_06.png renamed to content/applications/inventory_and_mrp/barcode/operations/internal/internal_06.png in HEAD, but deleted in 07170fb45 ([IMP] barcode: update barcode operations doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/internal/internal_07.png renamed to content/applications/inventory_and_mrp/barcode/operations/internal/internal_07.png in HEAD, but deleted in 07170fb45 ([IMP] barcode: update barcode operations doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/internal/internal_08.png renamed to content/applications/inventory_and_mrp/barcode/operations/internal/internal_08.png in HEAD, but deleted in 07170fb45 ([IMP] barcode: update barcode operations doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/internal/internal_09.png renamed to content/applications/inventory_and_mrp/barcode/operations/internal/internal_09.png in HEAD, but deleted in 07170fb45 ([IMP] barcode: update barcode operations doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/internal/internal_10.png renamed to content/applications/inventory_and_mrp/barcode/operations/internal/internal_10.png in HEAD, but deleted in 07170fb45 ([IMP] barcode: update barcode operations doc).
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/receipts_deliveries.rst added in 07170fb45 ([IMP] barcode: update barcode operations doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/receipts_deliveries.rst.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/receipts_deliveries/receipts-deliveries-barcode-scanner.png added in 07170fb45 ([IMP] barcode: update barcode operations doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/receipts_deliveries/receipts-deliveries-barcode-scanner.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/receipts_deliveries/receipts-deliveries-barcode-setting.png added in 07170fb45 ([IMP] barcode: update barcode operations doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/receipts_deliveries/receipts-deliveries-barcode-setting.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/receipts_deliveries/receipts-deliveries-operations-page.png added in 07170fb45 ([IMP] barcode: update barcode operations doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/receipts_deliveries/receipts-deliveries-operations-page.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/receipts_deliveries/receipts-deliveries-product-line-editor.png added in 07170fb45 ([IMP] barcode: update barcode operations doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/receipts_deliveries/receipts-deliveries-product-line-editor.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/receipts_deliveries/receipts-deliveries-purchase-order.png added in 07170fb45 ([IMP] barcode: update barcode operations doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/receipts_deliveries/receipts-deliveries-purchase-order.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/receipts_deliveries/receipts-deliveries-sales-order.png added in 07170fb45 ([IMP] barcode: update barcode operations doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/receipts_deliveries/receipts-deliveries-sales-order.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/receipts_deliveries/receipts-deliveries-scanner-overview.png added in 07170fb45 ([IMP] barcode: update barcode operations doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/receipts_deliveries/receipts-deliveries-scanner-overview.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/receipts_deliveries/receipts-deliveries-validate-delivery.png added in 07170fb45 ([IMP] barcode: update barcode operations doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/receipts_deliveries/receipts-deliveries-validate-delivery.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/receipts_deliveries/receipts-deliveries-validate-transfer.png added in 07170fb45 ([IMP] barcode: update barcode operations doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/receipts_deliveries/receipts-deliveries-validate-transfer.png.
CONFLICT (directory rename split): Unclear where to rename content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_usage to; it was renamed to multiple other directories, with no destination getting a majority of the files.
Auto-merging redirects/15.0.txt

stderr:

05:47:46.483888 git.c:463               trace: built-in: git cherry-pick 07170fb4537a9c2d49cd313c9d59fe2712a03acf
error: could not apply 07170fb45... [IMP] barcode: update barcode operations doc
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

@samueljlieber samueljlieber force-pushed the 16.0-15.0-inventory-update-barcode-transfers-brse-I8YV-fw branch from 9988bd8 to 4bb3240 Compare December 26, 2023 16:53
@C3POdoo C3POdoo requested a review from a team December 26, 2023 16:54
@samueljlieber
Copy link
Contributor

Resolved conflict in 4bb3240 due the 16.0 inventory restructure #5700. This PR should now be fine to continue FWP to master.

@samueljlieber samueljlieber removed the request for review from a team December 26, 2023 16:57
@samueljlieber samueljlieber force-pushed the 16.0-15.0-inventory-update-barcode-transfers-brse-I8YV-fw branch from 4bb3240 to 256ca2f Compare December 26, 2023 17:02
@samueljlieber
Copy link
Contributor

In 256ca2f I removed 15.0.txt redirect rule that was cherry-picked from 07170fb. All set 👍

@brse-odoo
Copy link
Contributor

@robodoo r+

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