Build #141

Plan branch:

Build: #141 was successful Scheduled with changes by Rafal Korytkowski

Code commits

openmrs-core 1.10.x

  • Rafal Korytkowski

    Rafal Korytkowski 330e28e0e6334c7470fe3b78956409e6f855e474

    TRUNK-4443 Fixed failing integration tests
    (cherry picked from commit ee12c7cd1881efdcef737d27740123f32af5a901)

    • api/src/main/java/org/openmrs/util/databasechange/CreateDiscontinueOrders.java (version 330e28e0e6334c7470fe3b78956409e6f855e474)
    • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version 330e28e0e6334c7470fe3b78956409e6f855e474)
    • api/src/test/resources/org/openmrs/util/databasechange/UpgradeTest-orderWithBlankUnitsOrFrequency.xml (version 330e28e0e6334c7470fe3b78956409e6f855e474)
    • api/src/test/resources/org/openmrs/util/databasechange/UpgradeTest-orderWithOrdererThatIsNotAProvider.xml (version 330e28e0e6334c7470fe3b78956409e6f855e474)
    • api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml (version 330e28e0e6334c7470fe3b78956409e6f855e474)
  • Rafal Korytkowski

    Rafal Korytkowski ab98cf76c94fe6bd83fc68232d266ffb810cc740

    TRUNK-4443 Renaming start_date in order to date_activated
    (cherry picked from commit cc8882cdaa734ee3fce8025775b8529a88aa16ab)

    Conflicts:
            api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java
            api/src/main/java/org/openmrs/reporting/export/DataExportFunctions.java
            api/src/main/resources/liquibase-update-to-latest.xml
            api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
            api/src/test/resources/org/openmrs/api/include/OrderServiceTest-ordersList.xml
            api/src/test/resources/org/openmrs/include/standardTestDataset.xml
            webapp/src/main/webapp/WEB-INF/messages.properties

    • api/src/main/java/org/openmrs/DrugOrder.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/main/java/org/openmrs/Order.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/main/java/org/openmrs/reporting/export/DataExportFunctions.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/main/java/org/openmrs/util/databasechange/CreateDiscontinueOrders.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/main/java/org/openmrs/validator/OrderValidator.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/main/resources/liquibase-update-to-latest.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/java/org/openmrs/DrugOrderTest.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/java/org/openmrs/OrderTest.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/java/org/openmrs/TestOrderTest.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/java/org/openmrs/api/EncounterServiceTest.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/java/org/openmrs/validator/OrderValidatorTest.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/java/org/openmrs/validator/TestOrderValidatorTest.java (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-numerics.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-deleteObsThatReference.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-discontinuedOrder.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersWitSameConceptAndDifferentFormAndStrength.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-fetchPreviousOrder.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-ordersList.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-otherOrders.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-reviseDiscontinuedOrders.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/util/databasechange/UpgradeTest-orderWithBlankUnitsOrFrequency.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/util/databasechange/UpgradeTest-orderWithOrdererThatIsNotAProvider.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version ab98cf76c94fe6bd83fc68232d266ffb810cc740)