Merge pull request #797 from jrogelstad/20734

Misc. fixes.
fix pullout
Merge pull request #798 from shackbarth/mocha

get tests to pass
issue #21189: do not always requery
Merge pull request #801 from jrogelstad/20734

issue #20734: Get ship shipment working for sales orders.
Merge pull request #800 from shackbarth/21189

issue #21189: do not always requery
Merge branch 'xtuple' into 20734