fix test cases

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@6341 9e4fa352-aafb-0310-9071-df624684024b
Changes for OVPMS-1544 Access application context in reports

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/trunk@6342 9e4fa352-aafb-0310-9071-df624684024b
Changes for OVPMS-1544 Access application context in reports

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/trunk@6343 9e4fa352-aafb-0310-9071-df624684024b
Changes for OVPMS-1544 Access application context in reports

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@6344 9e4fa352-aafb-0310-9071-df624684024b
Applied changes for OVPMS-1539 "Link Patient Documents and letters to invoice items such that batch numbers can be reported", contributed by Ben Charlton

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@6345 9e4fa352-aafb-0310-9071-df624684024b
removed mockito version - set in openvpms/pom.xml

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@6346 9e4fa352-aafb-0310-9071-df624684024b
Fix for OVPMS-1538 Current Discount popup calculation is incorrect

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@6347 9e4fa352-aafb-0310-9071-df624684024b
 Integrated changes for OVPMS-1539 "Link Patient Documents and letters to invoice items such that batch numbers can be reported" contributed by Ben Charlton

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@6348 9e4fa352-aafb-0310-9071-df624684024b
Integrated changes for OVPMS-1172 "Remove contact.faxNumber and replace with contact.phoneNumber, update existing fax numbers to the new system" contributed by Ben Charlton

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