ingadhoc/stock#706
Created by fw-bot-adhoc
Blocked
- Merge method
- Review
-
CI
- ci/runbot-oba: Odoo by Adhoc without running tests
- ci/runbot-modified-modules: (runtime 1s)
- mergebot/pre-commit
- label
- adhoc-dev:18.0-16.0-h-86602-jc-Rn5q-fw
- head
- d75751bcc33ed268f6103e9219dd9e6d92d06085
- target
- 18.0
- forward-port of
- ingadhoc/stock#645 DETACHED (conflicts: ('f49a059f7e9b71b0100dd4d6a396712c4410e6c4', 'Auto-merging stock_ux/models/stock_picking.py\nCONFLICT (content): Merge conflict in stock_ux/models/stock_picking.py\n', "19:09:03.306574 git.c:444 trace: built-in: git cherry-pick f49a059f7e9b71b0100dd4d6a396712c4410e6c4\nerror: could not apply f49a059f... [FIX]stock_ux:template in operation type\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['f49a059f7e9b71b0100dd4d6a396712c4410e6c4']) ('f49a059f7e9b71b0100dd4d6a396712c4410e6c4', 'Auto-merging stock_ux/models/stock_picking.py\nCONFLICT (content): Merge conflict in stock_ux/models/stock_picking.py\n', "19:09:03.306574 git.c:444 trace: built-in: git cherry-pick f49a059f7e9b71b0100dd4d6a396712c4410e6c4\nerror: could not apply f49a059f... [FIX]stock_ux:template in operation type\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['f49a059f7e9b71b0100dd4d6a396712c4410e6c4']))
[FW][FIX]stock_ux:template in operation type
Forward-Port-Of: ingadhoc/stock#648
Forward-Port-Of: ingadhoc/stock#645