[FW][FIX]stock_ux:template in operation type

[fw-bot-adhoc]

Forward-Port-Of: #648
Forward-Port-Of: #645

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@jcadhoc @ced-adhoc cherrypicking of pull request #645 failed.

stdout:

Auto-merging stock_ux/models/stock_picking.py
CONFLICT (content): Merge conflict in stock_ux/models/stock_picking.py

stderr:

19:09:03.306574 git.c:444               trace: built-in: git cherry-pick f49a059f7e9b71b0100dd4d6a396712c4410e6c4
error: could not apply f49a059f... [FIX]stock_ux:template in operation type
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