Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
07/16/08 12:29:31 (6 months ago)
Author:
bwolfe
Message:

Merging trunk to the 1.3.x branch (sideporting) to get bug fixes into an RC5 release [4745]:[4946]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/1.3.x/src/api/org/openmrs/api/PersonService.java

    r4358 r4947  
    379379        public List<RelationshipType> getAllRelationshipTypes() throws APIException; 
    380380         
    381         /** 
    382          * Get all relationshipTypes with or without the retired ones 
    383          *  
    384          * @param includeRetired true/false whether or not to include the relationship types 
    385          * @return relationshipType list 
    386          * @throws APIException 
    387          */ 
    388         @Transactional(readOnly = true) 
    389         @Authorized( { OpenmrsConstants.PRIV_VIEW_RELATIONSHIP_TYPES }) 
    390         public List<RelationshipType> getAllRelationshipTypes(boolean includeRetired) throws APIException; 
     381         
    391382         
    392383        /**