|
Wyclif Luyima
|
a1ef89d1b2bb5010b853c556d3a74fd7c600c9a5
a1ef89d1b2bb5010b853c556d3a74fd7c600c9a5 |
Moved up the code that checks the java type of an order that it matches that of the order type - TRUNK-4389 |
|
|
Wyclif Luyima
|
b6e9fcb7c21c40a3cb63c7c48a8a47ef9519c9e9
b6e9fcb7c21c40a3cb63c7c48a8a47ef9519c9e9 |
TRUNK-4392 Correct setting concept on drug order
Conflicts:
api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml |
|
|
Wyclif Luyima
|
df5e674160dacd60e92104e3ad2cd6e046d0b435
df5e674160dacd60e92104e3ad2cd6e046d0b435 |
Renamed unknownProvider GP name - TRUNK-4402
Conflicts:
api/src/main/resources/liquibase-update-to-latest.xml |
|
|
Daniel Kayiwa
|
0aaf8e6e09b1302403aec877ef5f6ca0533220e7
0aaf8e6e09b1302403aec877ef5f6ca0533220e7 |
Ignoring the randomly failing ModuleActivatorTest method - TRUNK-4418(cherry picked from commit 8155a771f2a5aed52078eca21ac2f8382f36ab08) |
|