Build #113

Plan branch:

Build: #113 was successful

Job: Default Job was successful

Stages & jobs

  1. Default Stage

Code commits

openmrs-core 1.10.x

  • Wyclif Luyima

    Wyclif Luyima a1ef89d1b2bb5010b853c556d3a74fd7c600c9a5

    Moved up the code that checks the java type of an order that it matches that of the order type - TRUNK-4389

    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version a1ef89d1b2bb5010b853c556d3a74fd7c600c9a5)
  • Wyclif Luyima

    Wyclif Luyima b6e9fcb7c21c40a3cb63c7c48a8a47ef9519c9e9

    TRUNK-4392 Correct setting concept on drug order
    Conflicts:
            api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml

    • api/src/main/java/org/openmrs/DrugOrder.java (version b6e9fcb7c21c40a3cb63c7c48a8a47ef9519c9e9)
    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version b6e9fcb7c21c40a3cb63c7c48a8a47ef9519c9e9)
    • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version b6e9fcb7c21c40a3cb63c7c48a8a47ef9519c9e9)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version b6e9fcb7c21c40a3cb63c7c48a8a47ef9519c9e9)
    • api/src/test/java/org/openmrs/DrugOrderTest.java (version b6e9fcb7c21c40a3cb63c7c48a8a47ef9519c9e9)
    • api/src/test/java/org/openmrs/OrderTest.java (version b6e9fcb7c21c40a3cb63c7c48a8a47ef9519c9e9)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version b6e9fcb7c21c40a3cb63c7c48a8a47ef9519c9e9)
    • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version b6e9fcb7c21c40a3cb63c7c48a8a47ef9519c9e9)
  • Wyclif Luyima

    Wyclif Luyima df5e674160dacd60e92104e3ad2cd6e046d0b435

    Renamed unknownProvider GP name - TRUNK-4402
    Conflicts:
            api/src/main/resources/liquibase-update-to-latest.xml

    • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version df5e674160dacd60e92104e3ad2cd6e046d0b435)
    • api/src/main/resources/liquibase-update-to-latest.xml (version df5e674160dacd60e92104e3ad2cd6e046d0b435)
    • api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml (version df5e674160dacd60e92104e3ad2cd6e046d0b435)
  • Daniel Kayiwa

    Daniel Kayiwa 0aaf8e6e09b1302403aec877ef5f6ca0533220e7

    Ignoring the randomly failing ModuleActivatorTest method - TRUNK-4418(cherry picked from commit 8155a771f2a5aed52078eca21ac2f8382f36ab08)

    • api/src/test/java/org/openmrs/module/ModuleActivatorTest.java (version 0aaf8e6e09b1302403aec877ef5f6ca0533220e7)