[fr/51439-DeleteCancelUndoShipping] Rebase master
requested to merge openbravo/devel/mods/org.openbravo.distributionorder:fr/51439-DeleteCancelUndoShipping_ into master
Rebase fr/51439-DeleteCancelUndoShipping
Rebase fr/51439-DeleteCancelUndoShipping