[FW][FIX] sale_order_type_automation_stock_voucher: print voucher only in…

[fw-bot-adhoc]

… orders with automation

Forward-Port-Of: #1122

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@lef-adhoc @matiasperalta1 cherrypicking of pull request #1122 failed.

stdout:

Auto-merging sale_order_type_automation_stock_voucher/models/sale_order.py
CONFLICT (content): Merge conflict in sale_order_type_automation_stock_voucher/models/sale_order.py

stderr:

20:49:37.666313 git.c:444               trace: built-in: git cherry-pick 3d3abf9c929bdc64f6e9266022d2b223a04271bc
error: could not apply 3d3abf9c... [FIX] sale_order_type_automation_stock_voucher: print voucher only in orders with automation
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
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