[FW][ADD]stock_ux: zpl global function

[fw-bot-adhoc]

Forward-Port-Of: #518

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@jcadhoc @mav-adhoc cherrypicking of pull request #518 failed.

stdout:

Auto-merging stock_ux/wizards/stock_picking_wizard_views.xml
CONFLICT (content): Merge conflict in stock_ux/wizards/stock_picking_wizard_views.xml
Auto-merging stock_ux/views/stock_picking_views.xml
Auto-merging stock_ux/views/stock_move_views.xml
Auto-merging stock_ux/views/stock_move_line_views.xml
CONFLICT (content): Merge conflict in stock_ux/views/stock_move_line_views.xml
Auto-merging stock_ux/__manifest__.py

stderr:

17:01:29.385909 git.c:444               trace: built-in: git cherry-pick 799f0d36c4628c8e1a5d827effd4b046c161977f
error: could not apply 799f0d36... [ADD]stock_ux: zpl global function
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