Change for OVPMS-1490 Add selling units to service products

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/trunk@6010 9e4fa352-aafb-0310-9071-df624684024b
pepare for release

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/trunk@6022 9e4fa352-aafb-0310-9071-df624684024b
Fixed javadoc

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/branches/1.8-dev@6047 9e4fa352-aafb-0310-9071-df624684024b
Fixes for OVPMS-1463 Find free appointment slots 
. handle 24 hour schedules

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

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/branches/1.8-dev@6052 9e4fa352-aafb-0310-9071-df624684024b
merged back changes from trunk

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/branches/1.8-dev@6054 9e4fa352-aafb-0310-9071-df624684024b
Merge branch 'remote-1.8'
Merge branch 'remote-1.8'

Conflicts:
	src/archetypes/org/openvpms/archetype/document/entityRelationship.documentTemplatePrinter.adl
	src/java/org/openvpms/archetype/rules/doc/DocumentException.java
	src/java/org/openvpms/archetype/rules/doc/DocumentTemplate.java
	src/java/org/openvpms/archetype/rules/doc/DocumentTemplatePrinter.java