Merge pull request #1216 from pmuchowski/TRUNK-3963-1.9.x
Putting back commented out code at: Visit validator should prevent or
Pawel Muchowski <pmuchowski@soldevelo.com>
5139fd49f42177b81764b9b78814e1143a14a878
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
Merge pull request #1215 from pmuchowski/TRUNK-3963-1.9.x TRUNK-3963: Visit validator should prevent or allow overlapping of visit...
Pawel Muchowski <pmuchowski@soldevelo.com>
d9ce0520e3417ecb31a509bba5137fdd5efd91c7
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