ingadhoc/stock#624

Created by fw-bot-adhoc

label

adhoc-dev:18.0-17.0-t-39830-mav-1-ODUG-fw

head

24de2bb990b77a08b1da781d3d139bdd71db52e6

target

18.0

merged

hace 3 meses by Juan Carreras

forward-port of

ingadhoc/stock#609 DETACHED (conflicts: ('bfc7b7a6a26d5e2d496ac70e12813532d53e3c70', 'Auto-merging stock_voucher/wizards/stock_picking_wizard_views.xml\nCONFLICT (content): Merge conflict in stock_voucher/wizards/stock_picking_wizard_views.xml\nAuto-merging stock_voucher/__manifest__.py\nCONFLICT (content): Merge conflict in stock_voucher/__manifest__.py\nAuto-merging stock_ux/__manifest__.py\n', "16:52:18.418539 git.c:444 trace: built-in: git cherry-pick bfc7b7a6a26d5e2d496ac70e12813532d53e3c70\nerror: could not apply bfc7b7a6... [FIX] stock: label_transfer_template\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", ['bfc7b7a6a26d5e2d496ac70e12813532d53e3c70']) ('bfc7b7a6a26d5e2d496ac70e12813532d53e3c70', 'Auto-merging stock_voucher/wizards/stock_picking_wizard_views.xml\nCONFLICT (content): Merge conflict in stock_voucher/wizards/stock_picking_wizard_views.xml\nAuto-merging stock_voucher/__manifest__.py\nCONFLICT (content): Merge conflict in stock_voucher/__manifest__.py\nAuto-merging stock_ux/__manifest__.py\n', "16:52:18.418539 git.c:444 trace: built-in: git cherry-pick bfc7b7a6a26d5e2d496ac70e12813532d53e3c70\nerror: could not apply bfc7b7a6... [FIX] stock: label_transfer_template\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", ['bfc7b7a6a26d5e2d496ac70e12813532d53e3c70']))

[FW][FIX] stock: label_transfer_template

Forward-Port-Of: ingadhoc/stock#609