ingadhoc/stock#648
Created by fw-bot-adhoc
Merged
at 99ef83b383a5d68ddd3a3e418c9770d510c4435c
- label
- adhoc-dev:17.0-16.0-h-86602-jc-z7n3-fw
- head
- f49a059f7e9b71b0100dd4d6a396712c4410e6c4
- target
- 17.0
- merged
- hace 3 meses by Matias Velazquez
- forward-port of
- ingadhoc/stock#645 DETACHED (conflicts: ('6554dd1d68355553184900d830436db5ba9316ae', 'Auto-merging stock_ux/models/stock_picking.py\nCONFLICT (content): Merge conflict in stock_ux/models/stock_picking.py\n', "13:03:54.949423 git.c:444 trace: built-in: git cherry-pick 6554dd1d68355553184900d830436db5ba9316ae\nerror: could not apply 6554dd1d... [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", ['6554dd1d68355553184900d830436db5ba9316ae']) ('6554dd1d68355553184900d830436db5ba9316ae', 'Auto-merging stock_ux/models/stock_picking.py\nCONFLICT (content): Merge conflict in stock_ux/models/stock_picking.py\n', "13:03:54.949423 git.c:444 trace: built-in: git cherry-pick 6554dd1d68355553184900d830436db5ba9316ae\nerror: could not apply 6554dd1d... [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", ['6554dd1d68355553184900d830436db5ba9316ae']))
[FW][FIX]stock_ux:template in operation type
Forward-Port-Of: ingadhoc/stock#645