Skip to content

Conversation

@fw-bot
Copy link
Collaborator

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

This PR is an [IMP] targeting the transfers_scratch 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

Forward-Port-Of: #6077

@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 #6077 failed.

stdout:

CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/transfers_scratch/transfers-scratch-barcode-app.png added in 10b42b032 ([IMP] barcode: update transfers scratch doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/transfers_scratch/transfers-scratch-barcode-app.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/transfers_scratch/transfers-scratch-blank-product-editor.png added in 10b42b032 ([IMP] barcode: update transfers scratch doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/transfers_scratch/transfers-scratch-blank-product-editor.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/transfers_scratch/transfers-scratch-demo-data.png added in 10b42b032 ([IMP] barcode: update transfers scratch doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/transfers_scratch/transfers-scratch-demo-data.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/transfers_scratch/transfers-scratch-detailed-operations-popup.png added in 10b42b032 ([IMP] barcode: update transfers scratch doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/transfers_scratch/transfers-scratch-detailed-operations-popup.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/transfers_scratch/transfers-scratch-enabled-barcode-setting.png added in 10b42b032 ([IMP] barcode: update transfers scratch doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/transfers_scratch/transfers-scratch-enabled-barcode-setting.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/transfers_scratch/transfers-scratch-internal-transfer-form.png added in 10b42b032 ([IMP] barcode: update transfers scratch doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/transfers_scratch/transfers-scratch-internal-transfer-form.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/transfers_scratch/transfers-scratch-product-line-editor.png added in 10b42b032 ([IMP] barcode: update transfers scratch doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/transfers_scratch/transfers-scratch-product-line-editor.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/transfers_scratch/transfers-scratch-receipts-overview.png added in 10b42b032 ([IMP] barcode: update transfers scratch doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/transfers_scratch/transfers-scratch-receipts-overview.png.
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/transfers_scratch/transfers_scratch_01.png renamed to content/applications/inventory_and_mrp/barcode/operations/transfers_scratch/transfers_scratch_01.png in HEAD, but deleted in 10b42b032 ([IMP] barcode: update transfers scratch doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/transfers_scratch/transfers_scratch_02.png renamed to content/applications/inventory_and_mrp/barcode/operations/transfers_scratch/transfers_scratch_02.png in HEAD, but deleted in 10b42b032 ([IMP] barcode: update transfers scratch doc).

stderr:

06:52:48.326370 git.c:463               trace: built-in: git cherry-pick 10b42b032dfd20ed3d6cae923e835c9873a5f5a8
error: could not apply 10b42b032... [IMP] barcode: update transfers scratch 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-barcode-update-transfer-scratch-brse-vLPu-fw branch from 5b445b6 to f8315e3 Compare December 26, 2023 16:31
@C3POdoo C3POdoo requested a review from a team December 26, 2023 16:33
@samueljlieber
Copy link
Contributor

Resolved conflict in f8315e3 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:36
@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.

4 participants