Build #112

Plan branch:

Build: #112 was successful Scheduled with changes by Rafal Korytkowski and mhawila <a.mhawila@gmail.com>

Code commits

openmrs-core 1.10.x

  • Rafal Korytkowski

    Rafal Korytkowski 8f9d84768041684305bad6330221f7427664041c

    TRUNK-4389 Added orderType check
    (cherry picked from commit 08e0bc1ddac0499972d491103d72c313aef77128)

    Conflicts:
            api/src/test/java/org/openmrs/OrderTest.java

    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 8f9d84768041684305bad6330221f7427664041c)
    • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version 8f9d84768041684305bad6330221f7427664041c)
    • api/src/test/java/org/openmrs/OrderTest.java (version 8f9d84768041684305bad6330221f7427664041c)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 8f9d84768041684305bad6330221f7427664041c)
  • Rafal Korytkowski

    Rafal Korytkowski 2fb947b8919f2e0e607c22a0dca92b5bec45bbce

    TRUNK-4389 Fixed tests and formatting
    (cherry picked from commit 108d2bfd4d619ed861a36709bb2775763ed6b9ab)

    Conflicts:
            api/src/main/java/org/openmrs/module/Module.java
            api/src/main/java/org/openmrs/util/DoubleRange.java

    (cherry picked from commit 460d4b75112f82888c919c1d9c67c4ecfe59e54c)

    • api/src/main/java/org/openmrs/OrderType.java (version 2fb947b8919f2e0e607c22a0dca92b5bec45bbce)
    • api/src/main/java/org/openmrs/api/OrderService.java (version 2fb947b8919f2e0e607c22a0dca92b5bec45bbce)
    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 2fb947b8919f2e0e607c22a0dca92b5bec45bbce)
    • api/src/main/java/org/openmrs/util/DoubleRange.java (version 2fb947b8919f2e0e607c22a0dca92b5bec45bbce)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 2fb947b8919f2e0e607c22a0dca92b5bec45bbce)
  • Rafal Korytkowski

    Rafal Korytkowski 7af3f197bafce805163f472c307a217094e9fb93

    TRUNK-4414 - Ensure message correctly reflects validation error
    (cherry picked from commit f607e0ebf115450fbde1c953d6734ff8e317d358)

    • webapp/src/main/webapp/WEB-INF/messages.properties (version 7af3f197bafce805163f472c307a217094e9fb93)
  • Rafal Korytkowski

    Rafal Korytkowski 717180f57c86501bdfcb90787cc2e5bf9909c0eb

    Merge pull request #950 from mhawila/TRUNK-4389
    TRUNK-4389: Added DRUG_ORDER_TYPE_UUID & TEST_ORDER_TYPE_UUID constants ...

  • mhawila <a.mhawila@gmail.com>

    mhawila <a.mhawila@gmail.com> cdb90e75c2fae11492fba94121c05ea3968143f5

    TRUNK-4389: Added DRUG_ORDER_TYPE_UUID & TEST_ORDER_TYPE_UUID constants to OrderType class, Added unit test method saveOrder_shouldSetOrderTypeOfDrugOrderToDrugOrderIfNotSetAndConceptNotMapped to OrderServiceTest, Added unit tests and code to set order type of drug/test order to drug/test order respectively if not set and concept not mapped in saveOrder() method

    • api/src/main/java/org/openmrs/OrderType.java (version cdb90e75c2fae11492fba94121c05ea3968143f5)
    • api/src/main/java/org/openmrs/api/OrderService.java (version cdb90e75c2fae11492fba94121c05ea3968143f5)
    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version cdb90e75c2fae11492fba94121c05ea3968143f5)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version cdb90e75c2fae11492fba94121c05ea3968143f5)