Build: #276 was successful
Job: Default Job was successful
Code commits
openmrs-core 1.10.x
-
Daniel Kayiwa 516162fb1da41ee8d8c39512a7ef00b3c88e1fd3
Merge pull request #1214 from pmuchowski/TRUNK-3963
TRUNK-3963: Visit validator should prevent or allow overlapping of visit... -
Pawel Muchowski <pmuchowski@soldevelo.com> 734b57e55122bc9b13515d152c5d42642e338744
TRUNK-3963: Visit validator should prevent or allow overlapping of visits depending on global property
Conflicts:
api/src/main/java/org/openmrs/util/OpenmrsConstants.java
api/src/test/java/org/openmrs/api/db/PatientDAOTest.java
api/src/test/java/org/openmrs/api/db/hibernate/PatientSearchCriteriaTest.java
api/src/test/java/org/openmrs/util/GlobalPropertiesTestHelper.java
Fixing failing tests for: Visit validator should prevent or allow
overlapping of visits depending on global property - TRUNK-3963
Conflicts:
api/src/test/java/org/openmrs/validator/VisitValidatorTest.java
Putting back commented out code at: Visit validator should prevent or
allow overlapping of visits depending on global property - TRUNK-3963
Conflicts:
api/src/main/java/org/openmrs/util/OpenmrsConstants.java
TRUNK-3963: Missing messages added
TRUNK-3963: Visit validator should prevent or allow overlapping of visits depending on global property- api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 734b57e55122bc9b13515d152c5d42642e338744)
- api/src/main/java/org/openmrs/validator/VisitValidator.java (version 734b57e55122bc9b13515d152c5d42642e338744)
- api/src/test/java/org/openmrs/api/VisitServiceTest.java (version 734b57e55122bc9b13515d152c5d42642e338744)
- api/src/test/java/org/openmrs/util/GlobalPropertiesTestHelper.java (version 734b57e55122bc9b13515d152c5d42642e338744)
- api/src/test/java/org/openmrs/validator/VisitValidatorTest.java (version 734b57e55122bc9b13515d152c5d42642e338744)
- api/src/test/resources/org/openmrs/validator/include/VisitValidatorTest.xml (version 734b57e55122bc9b13515d152c5d42642e338744)
- webapp/src/main/webapp/WEB-INF/messages.properties (version 734b57e55122bc9b13515d152c5d42642e338744)