Issue #20001:use correct cost method when calculating margin
Issue #20533:correctly handle PO supply orders when site changes
Merge pull request #31 from garyhgohoos/20533

Issue #20533:correctly handle PO supply orders when site changes
Merge pull request #28 from garyhgohoos/20001

Issue #20001:use correct cost method when calculating margin
Merge pull request #33 from gpazo/master

backlog of commits to R4_0_5, pushing up to master
issue #20554 replace missing flag for proper error message on login with 2+ users
Merge remote-tracking branch 'QTCLIENT/master'