Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jan 11, 2024

This PR is an [IMP] targeting the adjustments 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/17.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: #6889

@robodoo
Copy link
Collaborator

robodoo commented Jan 11, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jan 11, 2024

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

stdout:

CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/adjustments/adjustments-barcode-inventory-client-action.png added in dfd406b5d ([IMP] barcode: update adjustments doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/adjustments/adjustments-barcode-inventory-client-action.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/adjustments/adjustments-barcode-scanner.png added in dfd406b5d ([IMP] barcode: update adjustments doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/adjustments/adjustments-barcode-scanner.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/adjustments/adjustments-barcode-setting.png added in dfd406b5d ([IMP] barcode: update adjustments doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/adjustments/adjustments-barcode-setting.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/adjustments/adjustments-barcode-stock-sheets.png added in dfd406b5d ([IMP] barcode: update adjustments doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/adjustments/adjustments-barcode-stock-sheets.png.
CONFLICT (file location): content/applications/inventory_and_mrp/inventory/barcode/operations/adjustments/adjustments-keypad.png added in dfd406b5d ([IMP] barcode: update adjustments doc) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/inventory_and_mrp/barcode/operations/adjustments/adjustments-keypad.png.
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/adjustments/adjustments_01.png renamed to content/applications/inventory_and_mrp/barcode/operations/adjustments/adjustments_01.png in HEAD, but deleted in dfd406b5d ([IMP] barcode: update adjustments doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/adjustments/adjustments_02.png renamed to content/applications/inventory_and_mrp/barcode/operations/adjustments/adjustments_02.png in HEAD, but deleted in dfd406b5d ([IMP] barcode: update adjustments doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/adjustments/adjustments_03.png renamed to content/applications/inventory_and_mrp/barcode/operations/adjustments/adjustments_03.png in HEAD, but deleted in dfd406b5d ([IMP] barcode: update adjustments doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/adjustments/adjustments_04.png renamed to content/applications/inventory_and_mrp/barcode/operations/adjustments/adjustments_04.png in HEAD, but deleted in dfd406b5d ([IMP] barcode: update adjustments doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/adjustments/adjustments_05.png renamed to content/applications/inventory_and_mrp/barcode/operations/adjustments/adjustments_05.png in HEAD, but deleted in dfd406b5d ([IMP] barcode: update adjustments doc).
CONFLICT (rename/delete): content/applications/inventory_and_mrp/inventory/barcode/operations/adjustments/adjustments_06.png renamed to content/applications/inventory_and_mrp/barcode/operations/adjustments/adjustments_06.png in HEAD, but deleted in dfd406b5d ([IMP] barcode: update adjustments doc).

stderr:

23:04:05.663126 git.c:463               trace: built-in: git cherry-pick dfd406b5d641f4bfc8e66c05ad21ce1bb4cd2ad7
error: could not apply dfd406b5d... [IMP] barcode: update adjustments 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

@brse-odoo brse-odoo force-pushed the 16.0-15.0-barcode-update-inv-adj-brse-p2al-fw branch from 17bd542 to e262372 Compare January 16, 2024 17:02
@C3POdoo C3POdoo requested a review from a team January 16, 2024 17:03
@brse-odoo brse-odoo removed the request for review from a team January 16, 2024 17:05
@StraubCreative
Copy link
Contributor

Don't forget to merge when the issue is fixed, @brse-odoo 😉
You have that permission on FW PRs

@robodoo r+

@samueljlieber
Copy link
Contributor

Don't forget to merge when the issue is fixed, @brse-odoo 😉 You have that permission on FW PRs

@StraubCreative this was my fault, PR was waiting on an approval from me after fixing the conflict!

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