Build #259

Plan branch:

Build: #259 was successful Changes by Wyclif Luyima

Code commits

Git

  • Wyclif Luyima

    Wyclif Luyima 0dad90bab3c7968729b3a73e3654b9f498cf2646

    Merging patients should fail where the loser has unvoided orders - TRUNK-4353
    Follow up - TRUNK-4353

    • api/src/main/java/org/openmrs/api/PatientService.java (version 0dad90bab3c7968729b3a73e3654b9f498cf2646)
    • api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java (version 0dad90bab3c7968729b3a73e3654b9f498cf2646)
    • api/src/test/java/org/openmrs/api/PatientServiceTest.java (version 0dad90bab3c7968729b3a73e3654b9f498cf2646)
    • web/src/main/java/org/openmrs/web/controller/patient/MergePatientsFormController.java (version 0dad90bab3c7968729b3a73e3654b9f498cf2646)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version 0dad90bab3c7968729b3a73e3654b9f498cf2646)
    • webapp/src/main/webapp/WEB-INF/view/admin/patients/mergePatientsForm.jsp (version 0dad90bab3c7968729b3a73e3654b9f498cf2646)
  • Wyclif Luyima

    Wyclif Luyima 2b9d02240a5c7d2ef30bf99829d9430c22b429db

    Fixed typo on liquibase changeset comment

    • api/src/main/resources/liquibase-update-to-latest.xml (version 2b9d02240a5c7d2ef30bf99829d9430c22b429db)