Fix for OVPMS-1542 Generate Orders includes orders from different stock locations when determining stock on order

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/trunk@6331 9e4fa352-aafb-0310-9071-df624684024b
Merged fix for OVPMS-1542 "Generate Orders includes orders from different stock locations when determining stock on order" from trunk

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/branches/1.8-dev@6332 9e4fa352-aafb-0310-9071-df624684024b
Changes for OVPMS-1531 Screen auto lock

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/branches/1.8-dev@6335 9e4fa352-aafb-0310-9071-df624684024b