Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jun 27, 2024

Summary

  1. Create new doc detailing how Zebra code is altered to make adjustments to how ZPL labels are printed in Odoo

  2. Example code snippets:
      - adjust margins
      - resize barcode
      - rotate items 
    Task

Forward-Port-Of: #9699

@robodoo
Copy link
Collaborator

robodoo commented Jun 27, 2024

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jun 27, 2024

@Felicious cherrypicking of pull request #9699 failed.

stdout:

Auto-merging content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration.rst
CONFLICT (content): Merge conflict in content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration.rst

stderr:

01:38:30.783863 git.c:463               trace: built-in: git cherry-pick ae2ba8ab1a4829044d5910c1669c48d09ef47600 --strategy ort
error: could not apply ae2ba8ab1... [ADD] inventory: format zebra labels
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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 1, 2024

@Felicious this forward port of #9699 is awaiting action (not merged or closed).

@Felicious Felicious force-pushed the saas-17.1-17.0-inventory-format-zpl-feku-Nf4N-fw branch 2 times, most recently from 45d609a to a877ee2 Compare July 1, 2024 21:49
@C3POdoo C3POdoo requested a review from a team July 1, 2024 21:51
@Felicious
Copy link
Contributor

@robodoo r+

@robodoo
Copy link
Collaborator

robodoo commented Jul 1, 2024

@Felicious staging failed: ci/runbot on 57cc0d6c961488da8f0ee98898d9f3ba43a5657e (view more at https://runbot.odoo.com/runbot/build/64858856)

@Felicious
Copy link
Contributor

@robodoo retry

robodoo pushed a commit that referenced this pull request Jul 1, 2024
closes #9969

X-original-commit: 6495e78
Signed-off-by: Felicia Kuan (feku) <feku@odoo.com>
Co-authored-by: ksc-odoo <73958186+ksc-odoo@users.noreply.github.com>
Co-authored-by: Zachary Straub <zst@odoo.com>
Co-authored-by: Sam Lieber (sali) <36018073+samueljlieber@users.noreply.github.com>
@robodoo
Copy link
Collaborator

robodoo commented Jul 1, 2024

@Felicious staging failed: ci/runbot on 6cc2a3c5fe9fc808bdf196f0ffeee40e73100c8a (view more at https://runbot.odoo.com/runbot/build/64859081)

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 2, 2024

@Felicious this forward port of #9699 is awaiting action (not merged or closed).

7 similar comments
@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 3, 2024

@Felicious this forward port of #9699 is awaiting action (not merged or closed).

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 4, 2024

@Felicious this forward port of #9699 is awaiting action (not merged or closed).

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 5, 2024

@Felicious this forward port of #9699 is awaiting action (not merged or closed).

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 6, 2024

@Felicious this forward port of #9699 is awaiting action (not merged or closed).

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 7, 2024

@Felicious this forward port of #9699 is awaiting action (not merged or closed).

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 9, 2024

@Felicious this forward port of #9699 is awaiting action (not merged or closed).

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 17, 2024

@Felicious this forward port of #9699 is awaiting action (not merged or closed).

X-original-commit: 6495e78
Co-authored-by: ksc-odoo <73958186+ksc-odoo@users.noreply.github.com>
Co-authored-by: Zachary Straub <zst@odoo.com>
Co-authored-by: Sam Lieber (sali) <36018073+samueljlieber@users.noreply.github.com>
@Felicious Felicious force-pushed the saas-17.1-17.0-inventory-format-zpl-feku-Nf4N-fw branch from a877ee2 to 32a1f0d Compare July 17, 2024 17:40
@Felicious
Copy link
Contributor

@robodoo r+

@robodoo
Copy link
Collaborator

robodoo commented Jul 17, 2024

@Felicious staging failed: ci/upgrade_enterprise on 9dfeb2ea7f74e52b08336cf7e28487da2d165be4 (view more at https://runbot.odoo.com/runbot/build/65668532)

@robodoo
Copy link
Collaborator

robodoo commented Jul 18, 2024

This staging failed for probably sprurious reasons, we've reset the PR, it should be re-staged soon-ish.

robodoo pushed a commit that referenced this pull request Jul 18, 2024
closes #9969

X-original-commit: 6495e78
Signed-off-by: Felicia Kuan (feku) <feku@odoo.com>
Co-authored-by: ksc-odoo <73958186+ksc-odoo@users.noreply.github.com>
Co-authored-by: Zachary Straub <zst@odoo.com>
Co-authored-by: Sam Lieber (sali) <36018073+samueljlieber@users.noreply.github.com>
@robodoo robodoo closed this Jul 18, 2024
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.

3 participants