openmrs-core

• 

  Wyclif Luyima 13 Jun 2014 dcf417c18c7aa24d8cd1bdaa808dc0fce94235bd

  Merge branch 'master-merged'
• 

  Wyclif Luyima 13 Jun 2014 ab1f64d53b292469dbb328bba7034abbace32d01

  Applying auto format changes after merging 1.10.x into master

  • api/src/main/java/org/openmrs/Order.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/api/ConceptService.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/api/PatientService.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/api/db/ConceptDAO.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateUtil.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/module/ModuleClassLoader.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/order/OrderUtil.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/main/java/org/openmrs/util/PrivilegeConstants.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • api/src/test/java/org/openmrs/api/AdministrationServiceTest.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • web/src/main/java/org/openmrs/web/controller/patient/MergePatientsFormController.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
• 

  Wyclif Luyima 13 Jun 2014 abfc53ae3cf7c9dc4704afbda1ec5533592c2495

  Follow up to fix failing tests after merging 1.10.x into master

  • api/src/main/java/org/openmrs/Drug.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
  • api/src/main/java/org/openmrs/Provider.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
  • api/src/test/java/org/openmrs/api/PatientServiceTest.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
  • api/src/test/java/org/openmrs/api/db/hibernate/HibernatePatientDAOTest.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
  • api/src/test/java/org/openmrs/api/impl/ConceptServiceImplTest.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
  • api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateConceptTestDataSet.xml (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
• 

  Wyclif Luyima 13 Jun 2014 167641532cd82e2b38d9658a5e1b3b449c748ebb

  Merge branch '1.10.x' into master-merged
  Conflicts:
          .gitignore
          api/pom.xml
          api/src/main/java/org/openmrs/BaseOpenmrsObject.java
          api/src/main/java/org/openmrs/Concept.java
          api/src/main/java/org/openmrs/ConceptMap.java
          api/src/main/java/org/openmrs/ConceptReferenceTerm.java
          api/src/main/java/org/openmrs/Drug.java
          api/src/main/java/org/openmrs/Encounter.java
          api/src/main/java/org/openmrs/FormResource.java
          api/src/main/java/org/openmrs/GlobalProperty.java
          api/src/main/java/org/openmrs/Obs.java
          api/src/main/java/org/openmrs/Order.java
          api/src/main/java/org/openmrs/OrderType.java
          api/src/main/java/org/openmrs/Person.java
          api/src/main/java/org/openmrs/Role.java
          api/src/main/java/org/openmrs/TestOrder.java
          api/src/main/java/org/openmrs/annotation/DisableHandlers.java
          api/src/main/java/org/openmrs/annotation/OpenmrsProfileExcludeFilter.java
          api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java
          api/src/main/java/org/openmrs/aop/LoggingAdvice.java
          api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java
          api/src/main/java/org/openmrs/api/AdministrationService.java
          api/src/main/java/org/openmrs/api/ConceptService.java
          api/src/main/java/org/openmrs/api/EncounterService.java
          api/src/main/java/org/openmrs/api/EventListeners.java
          api/src/main/java/org/openmrs/api/FormService.java
          api/src/main/java/org/openmrs/api/LocationService.java
          api/src/main/java/org/openmrs/api/OrderService.java
          api/src/main/java/org/openmrs/api/PatientService.java
          api/src/main/java/org/openmrs/api/PatientSetService.java
          api/src/main/java/org/openmrs/api/PersonService.java
          api/src/main/java/org/openmrs/api/ProviderService.java
          api/src/main/java/org/openmrs/api/UserService.java
          api/src/main/java/org/openmrs/api/context/Context.java
          api/src/main/java/org/openmrs/api/context/Daemon.java
          api/src/main/java/org/openmrs/api/context/ServiceContext.java
          api/src/main/java/org/openmrs/api/context/UserContext.java
          api/src/main/java/org/openmrs/api/db/ConceptDAO.java
          api/src/main/java/org/openmrs/api/db/OrderDAO.java
          api/src/main/java/org/openmrs/api/db/PatientDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/AuditableInterceptor.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateFormDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernatePersonDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateSessionFactoryBean.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateUtil.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java
          api/src/main/java/org/openmrs/api/handler/ConceptReferenceTermSaveHandler.java
          api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/CohortServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/DatatypeServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java
          api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java
          api/src/main/java/org/openmrs/attribute/BaseAttribute.java
          api/src/main/java/org/openmrs/customdatatype/CustomDatatypeUtil.java
          api/src/main/java/org/openmrs/customdatatype/SerializingCustomDatatype.java
          api/src/main/java/org/openmrs/customdatatype/datatype/BooleanDatatype.java
          api/src/main/java/org/openmrs/customdatatype/datatype/DateDatatype.java
          api/src/main/java/org/openmrs/customdatatype/datatype/LongFreeTextDatatype.java
          api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java
          api/src/main/java/org/openmrs/migration/MigrationHelper.java
          api/src/main/java/org/openmrs/module/Module.java
          api/src/main/java/org/openmrs/module/ModuleClassLoader.java
          api/src/main/java/org/openmrs/module/ModuleConstants.java
          api/src/main/java/org/openmrs/module/ModuleFactory.java
          api/src/main/java/org/openmrs/module/ModuleFileParser.java
          api/src/main/java/org/openmrs/module/ModuleUtil.java
          api/src/main/java/org/openmrs/module/UpdateFileParser.java
          api/src/main/java/org/openmrs/notification/Note.java
          api/src/main/java/org/openmrs/order/OrderUtil.java
          api/src/main/java/org/openmrs/person/PersonMergeLogData.java
          api/src/main/java/org/openmrs/reporting/export/DataExportFunctions.java
          api/src/main/java/org/openmrs/scheduler/tasks/AutoCloseVisitsTask.java
          api/src/main/java/org/openmrs/util/DatabaseUpdater.java
          api/src/main/java/org/openmrs/util/ExceptionUtil.java
          api/src/main/java/org/openmrs/util/HibernateEnumType.java
          api/src/main/java/org/openmrs/util/HttpClient.java
          api/src/main/java/org/openmrs/util/LocaleUtility.java
          api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java
          api/src/main/java/org/openmrs/util/OpenmrsConstants.java
          api/src/main/java/org/openmrs/util/OpenmrsSecurityManager.java
          api/src/main/java/org/openmrs/util/OpenmrsUtil.java
          api/src/main/java/org/openmrs/util/PrivilegeConstants.java
          api/src/main/java/org/openmrs/validator/BaseCustomizableValidator.java
          api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java
          api/src/main/java/org/openmrs/validator/ConceptValidator.java
          api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
          api/src/main/java/org/openmrs/validator/EncounterRoleValidator.java
          api/src/main/java/org/openmrs/validator/EncounterValidator.java
          api/src/main/java/org/openmrs/validator/LocationValidator.java
          api/src/main/java/org/openmrs/validator/ObsValidator.java
          api/src/main/java/org/openmrs/validator/OrderValidator.java
          api/src/main/java/org/openmrs/validator/PatientProgramValidator.java
          api/src/main/java/org/openmrs/validator/PatientValidator.java
          api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java
          api/src/main/java/org/openmrs/validator/ProgramValidator.java
          api/src/main/java/org/openmrs/validator/RelationshipTypeValidator.java
          api/src/main/java/org/openmrs/validator/UserValidator.java
          api/src/main/java/org/openmrs/validator/ValidateUtil.java
          api/src/main/java/org/openmrs/validator/VisitValidator.java
          api/src/main/resources/hibernate.cfg.xml
          api/src/main/resources/liquibase-schema-only.xml
          api/src/main/resources/liquibase-update-to-latest.xml
          api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSetDerived.hbm.xml
          api/src/main/resources/org/openmrs/api/db/hibernate/Encounter.hbm.xml
          api/src/main/resources/org/openmrs/api/db/hibernate/FormResource.hbm.xml
          api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
          api/src/main/resources/org/openmrs/api/db/hibernate/OrderType.hbm.xml
          api/src/test/java/org/openmrs/ConceptNumericTest.java
          api/src/test/java/org/openmrs/EncounterTest.java
          api/src/test/java/org/openmrs/ObsTest.java
          api/src/test/java/org/openmrs/PatientProgramTest.java
          api/src/test/java/org/openmrs/PersonNameTest.java
          api/src/test/java/org/openmrs/ProviderTest.java
          api/src/test/java/org/openmrs/annotation/OpenmrsProfileExcludeFilterTest.java
          api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java
          api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java
          api/src/test/java/org/openmrs/api/AdministrationServiceTest.java
          api/src/test/java/org/openmrs/api/ConceptServiceTest.java
          api/src/test/java/org/openmrs/api/EncounterServiceTest.java
          api/src/test/java/org/openmrs/api/FormServiceTest.java
          api/src/test/java/org/openmrs/api/LocationServiceTest.java
          api/src/test/java/org/openmrs/api/ObsServiceTest.java
          api/src/test/java/org/openmrs/api/OrderServiceTest.java
          api/src/test/java/org/openmrs/api/PatientServiceTest.java
          api/src/test/java/org/openmrs/api/PersonServiceTest.java
          api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java
          api/src/test/java/org/openmrs/api/ProviderServiceTest.java
          api/src/test/java/org/openmrs/api/UserServiceTest.java
          api/src/test/java/org/openmrs/api/VisitServiceTest.java
          api/src/test/java/org/openmrs/api/context/DaemonTest.java
          api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java
          api/src/test/java/org/openmrs/api/db/PatientDAOTest.java
          api/src/test/java/org/openmrs/api/db/UserDAOTest.java
          api/src/test/java/org/openmrs/api/db/hibernate/AuditableInterceptorTest.java
          api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java
          api/src/test/java/org/openmrs/module/BaseModuleActivatorTest.java
          api/src/test/java/org/openmrs/module/ModuleActivatorTest.java
          api/src/test/java/org/openmrs/module/ModuleUtilTest.java
          api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java
          api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
          api/src/test/java/org/openmrs/util/HttpClientTest.java
          api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java
          api/src/test/java/org/openmrs/util/databasechange/DatabaseUpgradeTestUtil.java
          api/src/test/java/org/openmrs/validator/ConceptValidatorTest.java
          api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java
          api/src/test/java/org/openmrs/validator/LocationValidatorTest.java
          api/src/test/java/org/openmrs/validator/PatientProgramValidatorTest.java
          api/src/test/java/org/openmrs/validator/PatientValidatorTest.java
          api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java
          api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java
          api/src/test/java/org/openmrs/validator/ProgramValidatorTest.java
          api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java
          api/src/test/java/org/openmrs/validator/RelationshipTypeValidatorTest.java
          api/src/test/java/org/openmrs/validator/ValidateUtilTest.java
          api/src/test/java/org/openmrs/validator/VisitValidatorTest.java
          api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml
          api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
          api/src/test/resources/org/openmrs/api/include/OrderServiceTest-deleteObsThatReference.xml
          api/src/test/resources/org/openmrs/include/initialInMemoryTestDataSet.xml
          api/src/test/resources/org/openmrs/include/standardTestDataset.xml
          api/src/test/resources/org/openmrs/module/include/test1-1.0-SNAPSHOT.omod
          api/src/test/resources/org/openmrs/module/include/test1-2.0-SNAPSHOT.omod
          api/src/test/resources/org/openmrs/module/include/test2-1.0-SNAPSHOT.omod
          api/src/test/resources/org/openmrs/module/include/test3-1.0-SNAPSHOT.omod
          api/src/test/resources/org/openmrs/module/include/test3-2.0-SNAPSHOT.omod
          api/src/test/resources/org/openmrs/validator/include/VisitValidatorTest.xml
          pom.xml
          test/pom.xml
          tools/pom.xml
          web/pom.xml
          web/src/main/java/org/openmrs/module/web/WebModuleUtil.java
          web/src/main/java/org/openmrs/module/web/controller/ModuleListController.java
          web/src/main/java/org/openmrs/web/Listener.java
          web/src/main/java/org/openmrs/web/WebDaemon.java
          web/src/main/java/org/openmrs/web/attribute/handler/LongFreeTextTextareaHandler.java
          web/src/main/java/org/openmrs/web/controller/ConceptFormController.java
          web/src/main/java/org/openmrs/web/controller/ConceptFormValidator.java
          web/src/main/java/org/openmrs/web/controller/OptionsFormController.java
          web/src/main/java/org/openmrs/web/controller/PortletController.java
          web/src/main/java/org/openmrs/web/controller/RegimenPortletController.java
          web/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java
          web/src/main/java/org/openmrs/web/controller/concept/ConceptSourceListController.java
          web/src/main/java/org/openmrs/web/controller/customdatatype/CustomValueController.java
          web/src/main/java/org/openmrs/web/controller/form/FieldTypeListController.java
          web/src/main/java/org/openmrs/web/controller/form/FormFormController.java
          web/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java
          web/src/main/java/org/openmrs/web/controller/order/OrderDrugFormController.java
          web/src/main/java/org/openmrs/web/controller/order/OrderDrugListController.java
          web/src/main/java/org/openmrs/web/controller/order/OrderFormController.java
          web/src/main/java/org/openmrs/web/controller/order/OrderListByPatientController.java
          web/src/main/java/org/openmrs/web/controller/order/OrderListController.java
          web/src/main/java/org/openmrs/web/controller/patient/MergePatientsFormController.java
          web/src/main/java/org/openmrs/web/controller/patient/PatientDashboardController.java
          web/src/main/java/org/openmrs/web/controller/patient/PatientIdentifierTypeFormController.java
          web/src/main/java/org/openmrs/web/controller/patient/ShortPatientFormController.java
          web/src/main/java/org/openmrs/web/controller/patient/ShortPatientFormValidator.java
          web/src/main/java/org/openmrs/web/controller/person/AddPersonController.java
          web/src/main/java/org/openmrs/web/controller/program/PatientProgramFormController.java
          web/src/main/java/org/openmrs/web/controller/visit/ConfigureVisitsFormController.java
          web/src/main/java/org/openmrs/web/controller/visit/VisitFormController.java
          web/src/main/java/org/openmrs/web/controller/visit/VisitListController.java
          web/src/main/java/org/openmrs/web/dwr/ConceptListItem.java
          web/src/main/java/org/openmrs/web/dwr/DWRConceptService.java
          web/src/main/java/org/openmrs/web/dwr/DWREncounterService.java
          web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
          web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java
          web/src/main/java/org/openmrs/web/dwr/DWRProviderService.java
          web/src/main/java/org/openmrs/web/dwr/DrugOrderListItem.java
          web/src/main/java/org/openmrs/web/filter/StartupFilter.java
          web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java
          web/src/main/java/org/openmrs/web/filter/initialization/TestInstallUtil.java
          web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java
          web/src/main/java/org/openmrs/web/filter/update/UpdateFilterModel.java
          web/src/main/java/org/openmrs/web/filter/util/FilterUtil.java
          web/src/main/java/org/openmrs/web/filter/util/LocalizationTool.java
          web/src/main/java/org/openmrs/web/form/visit/ConfigureVisitsForm.java
          web/src/main/java/org/openmrs/web/taglib/FormatTag.java
          web/src/main/java/org/openmrs/web/taglib/PortletTag.java
          web/src/main/java/org/openmrs/web/taglib/RequireTag.java
          web/src/main/java/org/openmrs/web/taglib/fieldgen/DrugOrderDiscontinuedReasonHandler.java
          web/src/main/resources/openmrs-servlet.xml
          web/src/main/resources/org/openmrs/web/filter/initialization/installmethod.vm
          web/src/main/resources/org/openmrs/web/filter/initialization/remotedetails.vm
          web/src/test/java/org/openmrs/module/web/WebModuleUtilTest.java
          web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java
          web/src/test/java/org/openmrs/web/WebUtilTest.java
          web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
          web/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java
          web/src/test/java/org/openmrs/web/controller/form/FieldFormControllerTest.java
          web/src/test/java/org/openmrs/web/controller/person/AddPersonControllerTest.java
          web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
          web/src/test/java/org/openmrs/web/dwr/DWRPatientServiceTest.java
          web/src/test/java/org/openmrs/web/taglib/FormatTagTest.java
          web/src/test/java/org/openmrs/web/test/TestContextLoader.java
          webapp/pom.xml
          webapp/src/main/resources/liquibase-demo-data.zip
          webapp/src/main/webapp/WEB-INF/messages.properties
          webapp/src/main/webapp/WEB-INF/messages_es.properties
          webapp/src/main/webapp/WEB-INF/messages_fa.properties
          webapp/src/main/webapp/WEB-INF/messages_hi.properties
          webapp/src/main/webapp/WEB-INF/messages_in_ID.properties
          webapp/src/main/webapp/WEB-INF/messages_pt.properties
          webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld
          webapp/src/main/webapp/WEB-INF/tags/errorNotify.tag
          webapp/src/main/webapp/WEB-INF/template/banner.jsp
          webapp/src/main/webapp/WEB-INF/template/gutter.jsp
          webapp/src/main/webapp/WEB-INF/template/headerFull.jsp
          webapp/src/main/webapp/WEB-INF/template/headerMinimal.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptClassForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDatatypeForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptProposalForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSetDerivedForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptStopWordForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterRoleForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/encounters/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/forms/formList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/forms/formResources.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/forms/include/fieldEdit.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/forms/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7InArchiveMigration.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7SourceForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/hl7/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/index.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/locations/addressTemplate.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/locations/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/locations/locationAttributeType.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/locations/locationTag.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/locations/locationTagEdit.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/maintenance/implementationIdForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/maintenance/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/modules/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/modules/moduleList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/observations/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/orders/choosePatient.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/orders/orderListByPatient.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/orders/orderTypeForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/orders/orderTypeList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/patients/findDuplicatePatients.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/patients/include/editPatientIdentifier.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/patients/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/patients/mergePatientsForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/person/addPerson.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/person/include/editPersonInfo.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/person/include/showPersonInfo.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/person/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/person/personAttributeTypeForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/person/relationshipTypeForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/programs/conversionForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/programs/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/programs/programForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/programs/programList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/programs/workflowForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/provider/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/provider/providerAttributeTypeForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/provider/providerForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/scheduler/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/users/alertForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/users/alertList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/users/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/users/privilegeForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/users/roleList.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/visits/configureVisits.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/visits/localHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/visits/visitAttributeTypeForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/visits/visitTypeForm.jsp
          webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp
          webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
          webapp/src/main/webapp/WEB-INF/view/dictionary/conceptStatsForm.jsp
          webapp/src/main/webapp/WEB-INF/view/dictionary/index.jsp
          webapp/src/main/webapp/WEB-INF/view/help.jsp
          webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp
          webapp/src/main/webapp/WEB-INF/view/patientDashboardForm.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/addPersonForm.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/cohort.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/customMostRecentObs.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/nameLayout.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/patientDemographics.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/patientEncounters.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/patientGraphs.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCurrent.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/personRelationships.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/welcome.jsp
          webapp/src/main/webapp/WEB-INF/view/scripts/calendar/calendar.js
          webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl
          webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/jquery-ui-datepicker-i18n.js
          webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js
          webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js
          webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl
          webapp/src/main/webapp/WEB-INF/view/scripts/timepicker/timepicker.js
          webapp/src/main/webapp/WEB-INF/web.xml
          webapp/src/main/webapp/admin/orders/index.jsp
          webapp/src/main/webapp/dictionary/conceptForm.js
          webapp/src/main/webapp/errorhandler.jsp
          webapp/src/main/webapp/openmrs.css
          webapp/src/main/webapp/openmrs.js
• 

  Wyclif Luyima 10 Jun 2014 7b8309de81cfc27e018fef0d7e92caf55905ddb8

  Reverting all order entry related commits previously made prior to 1.10
  Revert "A few formatting changes made by the autoformatter..."
  
  This reverts commit 8560389ac9e5cfee5495036078b4331ff4c28e5e.
  
  Conflicts:
          api/src/main/java/org/openmrs/api/OrderService.java
  
  Revert "Add @since 1.10 to OrderService methods - TRUNK-3503"
  
  This reverts commit df653a2908fb1950fd9393dffc7e75a63d730f02.
  
  Revert "Added readonly transactional and privilege checks to OrderService"
  
  This reverts commit e4172b74bc397123cf55ca613a781b91c631b85f.
  
  Conflicts:
          api/src/main/java/org/openmrs/api/OrderService.java
  
  Revert "Merging order-entry branch to trunk rev:28043"
  
  This reverts commit f1ff17ad989a327f5e4abddeaba553821cd23bd3.
  
  Conflicts:
          api/src/test/java/org/openmrs/api/OrderServiceTest.java
          api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml
          api/src/test/resources/org/openmrs/api/include/OrderServiceTest-ordersList.xml
  
  Fixed missed code when resolving conflicts for previous reverts
  
  Revert "Merging order-entry to trunk rev:20830 - rev:28000"
  
  This reverts commit e617b404d5f2b70187331158dcd7db08311a2b1f.
  
  Conflicts:
          api/src/main/java/org/openmrs/BaseOrderable.java
          api/src/main/java/org/openmrs/Drug.java
          api/src/main/java/org/openmrs/GenericDrug.java
          api/src/main/java/org/openmrs/Order.java
          api/src/main/java/org/openmrs/TestOrder.java
          api/src/main/java/org/openmrs/api/OrderService.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
          api/src/main/java/org/openmrs/api/handler/OrderSaveHandler.java
          api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
          api/src/main/java/org/openmrs/order/OrderUtil.java
          api/src/main/java/org/openmrs/util/OpenmrsConstants.java
          api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
          api/src/main/java/org/openmrs/validator/OrderValidator.java
          api/src/main/resources/liquibase-update-to-latest.xml
          api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
          api/src/test/java/org/openmrs/api/OrderServiceTest.java
          api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
          api/src/test/resources/org/openmrs/include/standardTestDataset.xml
          api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml
          web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
          web/src/main/java/org/openmrs/web/dwr/DrugOrderListItem.java
          webapp/src/main/webapp/WEB-INF/messages.properties
          webapp/src/main/webapp/WEB-INF/tags/orderableField.tag
          webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
          webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
          webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
          webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl
  
  Fixed failing test due to test data set that doesn't match the data model
  
  Applying auto format changes
  
  Removed un needed changeset related to order entry since we reverted order entry work committed in master before 1.10

  • api/src/main/java/META-INF/MANIFEST.MF (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/BaseOrderable.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/ConceptClass.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/Drug.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/DrugOrder.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/GenericDrug.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/Order.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/Orderable.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/api/OrderService.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/api/db/OrderDAO.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/api/handler/OrderSaveHandler.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/order/OrderUtil.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/propertyeditor/OrderTypeEditor.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/util/PrivilegeConstants.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/validator/OrderTypeValidator.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/java/org/openmrs/validator/OrderValidator.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/resources/applicationContext-service.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/resources/hibernate.cfg.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/resources/liquibase-update-to-latest.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/DrugTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/GenericDrugTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/api/EncounterServiceTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/api/PatientServiceTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/api/db/OrderDAOTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/api/db/SerializedObjectDAOTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/api/handler/OrderSaveHandlerTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/propertyeditor/OrderTypeEditorTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/test/CreateInitialDataSet.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/validator/OrderTypeValidatorTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/validator/OrderValidatorTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/java/org/openmrs/validator/RequireNameValidatorTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-numerics.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-orderSetsTestDataset.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-ordersList.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-simpleOrderEntryTestDataset.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/OpenmrsBindingInitializer.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/controller/order/OrderByUserListController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/controller/order/OrderDrugFormController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/controller/order/OrderDrugListController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/controller/order/OrderFormController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/controller/order/OrderListByPatientController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/controller/order/OrderListController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/controller/order/OrderTypeFormController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/controller/order/OrderTypeListController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/controller/order/OrderTypeValidator.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/dwr/DWROrderService.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/dwr/DrugOrderListItem.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/dwr/OrderableListItem.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/taglib/fieldgen/OrderTypeHandler.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/java/org/openmrs/web/taglib/fieldgen/OrderableHandler.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • web/src/main/resources/openmrs-servlet.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • webapp/src/main/webapp/WEB-INF/dwr.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • webapp/src/main/webapp/WEB-INF/messages.properties (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • webapp/src/main/webapp/WEB-INF/tags/orderableField.tag (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • webapp/src/main/webapp/WEB-INF/view/fieldGen/orderable.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
• 

  Rafal Korytkowski 05 Jun 2014 0dc65364404be1e673fbdec80556ebb0ac79add0

  TRUNK-4392 Added nullsafe check

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 0dc65364404be1e673fbdec80556ebb0ac79add0)
• 

  Rafal Korytkowski 05 Jun 2014 5b04b21fe7daef79cfc9af8d4d989334d3b4857d

  TRUNK-4392 Correct setting concept on drug order

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 5b04b21fe7daef79cfc9af8d4d989334d3b4857d)
• 

  Rafal Korytkowski 04 Jun 2014 a766da1b13781f91b086f9beca5ffd20e4bb4798

  Corrected uuid of drug order type to match liquibase

  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version a766da1b13781f91b086f9beca5ffd20e4bb4798)
  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version a766da1b13781f91b086f9beca5ffd20e4bb4798)
• 

  Daniel Kayiwa 02 Jun 2014 0476d048f7d3d76f99e0570d70349d2c756cd15f

  Merge pull request #936 from kkaczmarczyk/TRUNK-4036-1.10.x
  Trunk 4036 1.10.x
• 

  Krzysztof Kaczmarczyk <kkaczmarczyk@soldevelo.com> 02 Jun 2014 7699e3617231300f17340fc4d2dbd4097ac07759

  Filled out Independent annotation description

  • api/src/main/java/org/openmrs/annotation/Independent.java (version 7699e3617231300f17340fc4d2dbd4097ac07759)
• 

  Krzysztof Kaczmarczyk <kkaczmarczyk@soldevelo.com> 02 Jun 2014 2c0e06fcc5a15c0c15d7f420d326102284f34449

  TRUNK-4036: Retiring a Location also retires the location tag

  • api/src/main/java/org/openmrs/Location.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
  • api/src/main/java/org/openmrs/OrderType.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
  • api/src/main/java/org/openmrs/annotation/Independent.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
  • api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
  • api/src/test/java/org/openmrs/api/LocationServiceTest.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
• 

  Wyclif Luyima 30 May 2014 c09b4d7186bfd6eaba7c5dc4f721696313516593

  TRUNK-2694 Fix Performance hog: Maps and sets of URLs
  (cherry picked from commit 358de98ed9954c3eb0b9b31031f7dffe0ee8a9b1)
  
  manually added missing imports

  • api/src/main/java/org/openmrs/module/ModuleClassLoader.java (version c09b4d7186bfd6eaba7c5dc4f721696313516593)
  • api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java (version c09b4d7186bfd6eaba7c5dc4f721696313516593)
• 

  Wyclif Luyima 30 May 2014 2038b0a41bb1ea09297fb85f7007335c3ddd2951

  Revert "[TRUNK-3982] SchedulerUtil locks out openmrs user with false log in attempts."
  This reverts commit 117eaed29198ccca156bda508022acf3f69b9e78.

  • web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java (version 2038b0a41bb1ea09297fb85f7007335c3ddd2951)
• 

  Wyclif Luyima 30 May 2014 117eaed29198ccca156bda508022acf3f69b9e78

  [TRUNK-3982] SchedulerUtil locks out openmrs user with false log in attempts.

  • web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java (version 117eaed29198ccca156bda508022acf3f69b9e78)
• 

  Wyclif Luyima 30 May 2014 4294fc6bcb5158bf2d231505cb706ff8b57bd55c

  Cleaned up PatientServiceTest

  • api/src/main/java/org/openmrs/api/PatientService.java (version 4294fc6bcb5158bf2d231505cb706ff8b57bd55c)
  • api/src/test/java/org/openmrs/api/PatientServiceTest.java (version 4294fc6bcb5158bf2d231505cb706ff8b57bd55c)
• 

  Wyclif Luyima 30 May 2014 d957fac5037200f248b9d0527a06419690b42312

  Revert "Revert "ConceptNumeric(concept) incorrectly copies collections - TRUNK-3974""
  This reverts commit d41e15b52a124e5c64da1c5b90b527c647e3cd0d.

  • api/src/main/java/org/openmrs/ConceptNumeric.java (version d957fac5037200f248b9d0527a06419690b42312)
  • api/src/test/java/org/openmrs/ConceptNumericTest.java (version d957fac5037200f248b9d0527a06419690b42312)
• 

  Wyclif Luyima 30 May 2014 d41e15b52a124e5c64da1c5b90b527c647e3cd0d

  Revert "ConceptNumeric(concept) incorrectly copies collections - TRUNK-3974"
  This reverts commit 75a01e8c3d9f06e5395f9d23f30a194392eed1b3.

  • api/src/main/java/org/openmrs/ConceptNumeric.java (version d41e15b52a124e5c64da1c5b90b527c647e3cd0d)
  • api/src/test/java/org/openmrs/ConceptNumericTest.java (version d41e15b52a124e5c64da1c5b90b527c647e3cd0d)
• 

  Rafal Korytkowski 28 May 2014 aecc9d6087dd35176a9b01f4ab1a992fdbff1832

  TRUNK-4378 Modules using conditional loading should not fail on older versions
  (cherry picked from commit adc56e8a12fa61b65c8437326fd15d03fdf98819)

  • api/src/main/java/org/openmrs/annotation/OpenmrsComponent.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
  • api/src/main/java/org/openmrs/annotation/OpenmrsComponentIncludeFilter.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
  • api/src/main/java/org/openmrs/annotation/OpenmrsProfile.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
  • api/src/main/java/org/openmrs/annotation/OpenmrsProfileIncludeFilter.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
  • api/src/main/resources/applicationContext-service.xml (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
  • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_6To1_7.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
  • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_8.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
  • api/src/test/java/org/openmrs/annotation/OpenmrsComponentIncludeFilterTest.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
  • api/src/test/java/org/openmrs/annotation/OpenmrsProfileIncludeFilterTest.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
• 

  Wyclif Luyima 22 May 2014 ad9ce0b89446c07c3a5ba1092d167d2620625ab1

  Rephrased the error message when an unorderable concept is used for an order

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version ad9ce0b89446c07c3a5ba1092d167d2620625ab1)
• 

  Wyclif Luyima 22 May 2014 f4af5ddd8c1269c20e3c2a4422743d4852a9ce4e

  Replaced reprecated method call

  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version f4af5ddd8c1269c20e3c2a4422743d4852a9ce4e)
• 

  Wyclif Luyima 22 May 2014 00ca0b060b88e2517444ffb6e0ae152ac5b561e2

  Renamed OrderService.getDrugDurationUnits to getDurationUnits and associated global property

  • api/src/main/java/org/openmrs/api/OrderService.java (version 00ca0b060b88e2517444ffb6e0ae152ac5b561e2)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 00ca0b060b88e2517444ffb6e0ae152ac5b561e2)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 00ca0b060b88e2517444ffb6e0ae152ac5b561e2)
  • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 00ca0b060b88e2517444ffb6e0ae152ac5b561e2)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 00ca0b060b88e2517444ffb6e0ae152ac5b561e2)
  • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 00ca0b060b88e2517444ffb6e0ae152ac5b561e2)
  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 00ca0b060b88e2517444ffb6e0ae152ac5b561e2)
• 

  Wyclif Luyima 22 May 2014 47e2597de14ee077845c513b96aff250ef5a4337

  Fixed integration tests not to set the order type

  • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version 47e2597de14ee077845c513b96aff250ef5a4337)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 47e2597de14ee077845c513b96aff250ef5a4337)
  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 47e2597de14ee077845c513b96aff250ef5a4337)
• 

  Wyclif Luyima 21 May 2014 9beff951f67d946cc29971d9ff75abfbc2e8f798

  Fixed failing changesets

  • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version 9beff951f67d946cc29971d9ff75abfbc2e8f798)
• 

  Wyclif Luyima 21 May 2014 0343c9e730dcf503418d431736cd7434d70c9499

  Fixed failing changesets on CI
  Fixed failing changesets

  • api/src/main/java/org/openmrs/api/db/hibernate/ChainingInterceptor.java (version 0343c9e730dcf503418d431736cd7434d70c9499)
  • api/src/main/resources/liquibase-update-to-latest.xml (version 0343c9e730dcf503418d431736cd7434d70c9499)
• 

  Wyclif Luyima 20 May 2014 f396c291ec3d181bec2f26800e73793e44fcd705

  Removed changes in chaining interceptor that call immutable entity interceptors last

  • api/src/main/java/org/openmrs/api/db/hibernate/ChainingInterceptor.java (version f396c291ec3d181bec2f26800e73793e44fcd705)
• 

  Wyclif Luyima 20 May 2014 abb470e1b2fd14de1b18fd3441ba6356c7ab6b92

  Updated saveOrder to allow duplicate orders in different care settings

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

  Wyclif Luyima 20 May 2014 cc00b0155ad843eb80962db13958959937ee3987

  Updated typo in liquibase comment
  Fixed invalid changeset id
  
  Updated typo in liquibase comment

  • api/src/main/resources/liquibase-update-to-latest.xml (version cc00b0155ad843eb80962db13958959937ee3987)
  • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version cc00b0155ad843eb80962db13958959937ee3987)
• 

  Wyclif Luyima 17 May 2014 aa471701442335842eb1cd1a02790f057e50905b

  Rephrased comment for liquibase changeset that checks if dose units and frequencies have been mapped to concepts

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

  Wyclif Luyima 16 May 2014 612a271ad3a3e50289b3fe62771394b5c445ae10

  Reorganised liquibase changesets so that all 1.10 changesets come after those in 1.9

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

  Wyclif Luyima 16 May 2014 097556eecd6ec152aa197594a68e0a2f9937748a

  Fixed stray changes in 1.10 in liquibase update file

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

  Rafal Korytkowski 16 May 2014 b20b5d7152fbf48daa81b96e18249187428c78dc

  TRUNK-4378 Add OpenmrsComponent annotation
  (cherry picked from commit 7c13fb80212be503667d4608d50cc77f466fb44e)
  
  Conflicts:
          api/src/test/java/org/openmrs/annotation/OpenmrsProfileExcludeFilterTest.java

  • api/src/main/java/org/openmrs/annotation/OpenmrsComponent.java (version b20b5d7152fbf48daa81b96e18249187428c78dc)
  • api/src/main/java/org/openmrs/annotation/OpenmrsComponentIncludeFilter.java (version b20b5d7152fbf48daa81b96e18249187428c78dc)
  • api/src/main/java/org/openmrs/annotation/OpenmrsProfile.java (version b20b5d7152fbf48daa81b96e18249187428c78dc)
  • api/src/main/java/org/openmrs/annotation/OpenmrsProfileExcludeFilter.java (version b20b5d7152fbf48daa81b96e18249187428c78dc)
  • api/src/main/java/org/openmrs/annotation/OpenmrsProfileExclusionFilter.java (version b20b5d7152fbf48daa81b96e18249187428c78dc)
  • api/src/main/resources/applicationContext-service.xml (version b20b5d7152fbf48daa81b96e18249187428c78dc)
  • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_6To1_7.java (version b20b5d7152fbf48daa81b96e18249187428c78dc)
  • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_8.java (version b20b5d7152fbf48daa81b96e18249187428c78dc)
  • api/src/test/java/org/openmrs/annotation/OpenmrsComponentIncludeFilterTest.java (version b20b5d7152fbf48daa81b96e18249187428c78dc)
  • api/src/test/java/org/openmrs/annotation/OpenmrsProfileExcludeFilterTest.java (version b20b5d7152fbf48daa81b96e18249187428c78dc)
  • api/src/test/java/org/openmrs/annotation/OpenmrsProfileExclusionFilterTest.java (version b20b5d7152fbf48daa81b96e18249187428c78dc)
• 

  Wyclif Luyima 15 May 2014 bcaafe652203c1662a8f76282084363e5c3af391

  Follow up to address add unit tests for test with valid specimen source concept - TRUNK-4377

  • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version bcaafe652203c1662a8f76282084363e5c3af391)
  • api/src/main/java/org/openmrs/validator/TestOrderValidator.java (version bcaafe652203c1662a8f76282084363e5c3af391)
  • api/src/test/java/org/openmrs/validator/TestOrderValidatorTest.java (version bcaafe652203c1662a8f76282084363e5c3af391)
  • webapp/src/main/webapp/WEB-INF/messages.properties (version bcaafe652203c1662a8f76282084363e5c3af391)
• 

  Rafal Korytkowski 15 May 2014 e07a7b8bcd1e3abc3f3ea5559c8c74a6f8f8ccdc

  Fixed failing tests

  • api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java (version e07a7b8bcd1e3abc3f3ea5559c8c74a6f8f8ccdc)
  • web/src/test/java/org/openmrs/web/dwr/DWRProgramWorkflowServiceTest.java (version e07a7b8bcd1e3abc3f3ea5559c8c74a6f8f8ccdc)
• 

  Rafal Korytkowski 15 May 2014 a4582641131feda0f9b74bb4f745238a7767a5d2

  Adjust test data to use not taken ids

  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version a4582641131feda0f9b74bb4f745238a7767a5d2)
• 

  Wyclif Luyima 15 May 2014 05c83a3d9445c4c9f014e58bb9737458acb9ce97

  Cleaned up Order.hbm.xml

  • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version 05c83a3d9445c4c9f014e58bb9737458acb9ce97)
• 

  Wyclif Luyima 15 May 2014 a71f33504597d034d8f5782fbf9fb0f08d4b7992

  Follow up to add concepts sets for routes and specimens to test data

  • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version a71f33504597d034d8f5782fbf9fb0f08d4b7992)
  • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version a71f33504597d034d8f5782fbf9fb0f08d4b7992)
  • api/src/test/java/org/openmrs/api/AdministrationServiceTest.java (version a71f33504597d034d8f5782fbf9fb0f08d4b7992)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version a71f33504597d034d8f5782fbf9fb0f08d4b7992)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version a71f33504597d034d8f5782fbf9fb0f08d4b7992)
  • api/src/test/resources/org/openmrs/api/include/OrderEntryIntegrationTest-other.xml (version a71f33504597d034d8f5782fbf9fb0f08d4b7992)
  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version a71f33504597d034d8f5782fbf9fb0f08d4b7992)
• 

  Wyclif Luyima 15 May 2014 c7b7500d03eb0149021e7fa35ae20eb37701c630

  Added validation check for drugOrder.route to be in the allowed concepts

  • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version c7b7500d03eb0149021e7fa35ae20eb37701c630)
  • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version c7b7500d03eb0149021e7fa35ae20eb37701c630)
  • api/src/test/java/org/openmrs/validator/TestOrderValidatorTest.java (version c7b7500d03eb0149021e7fa35ae20eb37701c630)
  • webapp/src/main/webapp/WEB-INF/messages.properties (version c7b7500d03eb0149021e7fa35ae20eb37701c630)
• 

  Wyclif Luyima 15 May 2014 80174f475633c1d5b0b0a90f3d16a808b0650769

  Fixed possible NullPointerException
  Fixed possible NullPointerException

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 80174f475633c1d5b0b0a90f3d16a808b0650769)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 80174f475633c1d5b0b0a90f3d16a808b0650769)
• 

  Wyclif Luyima 15 May 2014 02fd226f723cae669785aa3f38fd2814acbbd136

  Removed unused @should

  • api/src/main/java/org/openmrs/api/OrderService.java (version 02fd226f723cae669785aa3f38fd2814acbbd136)
• 

  Wyclif Luyima 15 May 2014 3ac84b34d287e93d6fbad447eeb1fc9c8e6773ba

  Test specimen sources should be configurable via a concept set global property - TRUNK-4377

  • api/src/main/java/org/openmrs/api/OrderService.java (version 3ac84b34d287e93d6fbad447eeb1fc9c8e6773ba)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 3ac84b34d287e93d6fbad447eeb1fc9c8e6773ba)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 3ac84b34d287e93d6fbad447eeb1fc9c8e6773ba)
  • api/src/main/java/org/openmrs/validator/TestOrderValidator.java (version 3ac84b34d287e93d6fbad447eeb1fc9c8e6773ba)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 3ac84b34d287e93d6fbad447eeb1fc9c8e6773ba)
  • api/src/test/java/org/openmrs/validator/TestOrderValidatorTest.java (version 3ac84b34d287e93d6fbad447eeb1fc9c8e6773ba)
  • api/src/test/resources/org/openmrs/api/include/OrderEntryIntegrationTest-other.xml (version 3ac84b34d287e93d6fbad447eeb1fc9c8e6773ba)
  • webapp/src/main/webapp/WEB-INF/messages.properties (version 3ac84b34d287e93d6fbad447eeb1fc9c8e6773ba)
• 

  Wyclif Luyima 14 May 2014 f081ecb2c5ae0416a1a95fe9c54b87e2477b580d

  Renamed global property constant for drug order route concept uuid

  • api/src/main/java/org/openmrs/api/OrderService.java (version f081ecb2c5ae0416a1a95fe9c54b87e2477b580d)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version f081ecb2c5ae0416a1a95fe9c54b87e2477b580d)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version f081ecb2c5ae0416a1a95fe9c54b87e2477b580d)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version f081ecb2c5ae0416a1a95fe9c54b87e2477b580d)
• 

  Wyclif Luyima 14 May 2014 8ad5c39c2600e5952656a42bc13762feda2956d4

  Cleaned up some code in OrderServiceImpl

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 8ad5c39c2600e5952656a42bc13762feda2956d4)
• 

  Wyclif Luyima 14 May 2014 d4296caa401be9f6998bb0c7d869e51275b92a45

  Order Service allows duplicate orders - TRUNK-4371

  • api/src/main/java/org/openmrs/api/OrderService.java (version d4296caa401be9f6998bb0c7d869e51275b92a45)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version d4296caa401be9f6998bb0c7d869e51275b92a45)
  • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version d4296caa401be9f6998bb0c7d869e51275b92a45)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version d4296caa401be9f6998bb0c7d869e51275b92a45)
  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version d4296caa401be9f6998bb0c7d869e51275b92a45)
• 

  Wyclif Luyima 14 May 2014 191cbbfcacf8471e048ece6502cf13921a7d3372

  Updated test data to add a drug_order row for order with id 222

  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 191cbbfcacf8471e048ece6502cf13921a7d3372)
• 

  Wyclif Luyima 13 May 2014 36a41e438131ff56e6b26a20f0fa9491d34e6148

  Added some helpful comments to the test that ensures that previous orders are not returned as proxies

  • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version 36a41e438131ff56e6b26a20f0fa9491d34e6148)
• 

  Wyclif Luyima 13 May 2014 a872337c63d7f5754ebe23fe631bee5689a43474

  Added test to ensure that retrospective data entry is possible

  • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version a872337c63d7f5754ebe23fe631bee5689a43474)
• 

  Wyclif Luyima 13 May 2014 26e6ee7bc233a4effe1b0510f2ebd4ffb7634db5

  Added liquibase changeset to drop not null constraints from drug_order.dosing_type column

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

  Wyclif Luyima 13 May 2014 60340cde5548703ec86b9a95b9d92ce3d4edd60a

  Added clone revision helper methods so that we can can factor out reusable code to Order class

  • api/src/main/java/org/openmrs/DrugOrder.java (version 60340cde5548703ec86b9a95b9d92ce3d4edd60a)
  • api/src/main/java/org/openmrs/Order.java (version 60340cde5548703ec86b9a95b9d92ce3d4edd60a)
  • api/src/main/java/org/openmrs/TestOrder.java (version 60340cde5548703ec86b9a95b9d92ce3d4edd60a)
• 

  Wyclif Luyima 13 May 2014 dc076530ee780d1f1f59d0f4944d331c4b5d2bc5

  Improved javadocs for OrderService.getDiscontinuationOrder and getRevisionOrder
  Fixed typo in update scripts
  
  Apply auto format changes

  • api/src/main/java/org/openmrs/api/OrderService.java (version dc076530ee780d1f1f59d0f4944d331c4b5d2bc5)
  • api/src/main/resources/liquibase-update-to-latest.xml (version dc076530ee780d1f1f59d0f4944d331c4b5d2bc5)
• 

  Wyclif Luyima 12 May 2014 97a375dccbfffdeca1b0c1261896fa4c5a6e8a99

  Made previousOrder optional for DC orders

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

  Wyclif Luyima 12 May 2014 bb47254fa1a1d228dfe64cbef8f132b921dbb1b3

  Update getRevisionOrder to ignore voided revision orders

  • api/src/main/java/org/openmrs/api/OrderService.java (version bb47254fa1a1d228dfe64cbef8f132b921dbb1b3)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version bb47254fa1a1d228dfe64cbef8f132b921dbb1b3)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version bb47254fa1a1d228dfe64cbef8f132b921dbb1b3)
• 

  Wyclif Luyima 12 May 2014 8299710d51fc11d9e1a89f29aabc8b3840f36559

  Changed to setting autoExpireDate instead of dateStopped for DC orders
  Follow up

  • api/src/main/java/org/openmrs/DrugOrder.java (version 8299710d51fc11d9e1a89f29aabc8b3840f36559)
  • api/src/main/java/org/openmrs/Order.java (version 8299710d51fc11d9e1a89f29aabc8b3840f36559)
  • api/src/main/java/org/openmrs/TestOrder.java (version 8299710d51fc11d9e1a89f29aabc8b3840f36559)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 8299710d51fc11d9e1a89f29aabc8b3840f36559)
  • api/src/main/java/org/openmrs/util/databasechange/CreateDiscontinueOrders.java (version 8299710d51fc11d9e1a89f29aabc8b3840f36559)
  • api/src/test/java/org/openmrs/DrugOrderTest.java (version 8299710d51fc11d9e1a89f29aabc8b3840f36559)
  • api/src/test/java/org/openmrs/OrderTest.java (version 8299710d51fc11d9e1a89f29aabc8b3840f36559)
  • api/src/test/java/org/openmrs/TestOrderTest.java (version 8299710d51fc11d9e1a89f29aabc8b3840f36559)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 8299710d51fc11d9e1a89f29aabc8b3840f36559)
  • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version 8299710d51fc11d9e1a89f29aabc8b3840f36559)
  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 8299710d51fc11d9e1a89f29aabc8b3840f36559)
• 

  Wyclif Luyima 12 May 2014 2959528a15d084aed80f31e1b6d4718bcb7b2e94

  Cleaned unit tests and @should for DrugOrderValidator

  • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 2959528a15d084aed80f31e1b6d4718bcb7b2e94)
  • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 2959528a15d084aed80f31e1b6d4718bcb7b2e94)
• 

  Rafal Korytkowski 12 May 2014 c5efaa8d52106090e040b7214eed095281b046d8

  TRUNK-4359 Post review adjustements

  • api/src/main/java/org/openmrs/api/OrderService.java (version c5efaa8d52106090e040b7214eed095281b046d8)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version c5efaa8d52106090e040b7214eed095281b046d8)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version c5efaa8d52106090e040b7214eed095281b046d8)
  • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version c5efaa8d52106090e040b7214eed095281b046d8)
  • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version c5efaa8d52106090e040b7214eed095281b046d8)
  • api/src/test/java/org/openmrs/api/AdministrationServiceTest.java (version c5efaa8d52106090e040b7214eed095281b046d8)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version c5efaa8d52106090e040b7214eed095281b046d8)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version c5efaa8d52106090e040b7214eed095281b046d8)
  • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version c5efaa8d52106090e040b7214eed095281b046d8)
  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version c5efaa8d52106090e040b7214eed095281b046d8)
  • api/src/test/resources/org/openmrs/util/databasechange/database1_9To1_10UpgradeTest-dataSet.xml (version c5efaa8d52106090e040b7214eed095281b046d8)
• 

  Rafal Korytkowski 12 May 2014 5ae0fef3975693ee53ae5c648c3785110645db9b

  TRUNK-4359 Units Of Measure concept class needs to be split into 2 separate concept classes

  • api/src/main/java/org/openmrs/ConceptClass.java (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/main/java/org/openmrs/api/OrderService.java (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/main/java/org/openmrs/util/UpgradeUtil.java (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/main/java/org/openmrs/util/databasechange/MigrateDrugOrderUnitsToCodedDoseUnitsChangeset.java (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/main/resources/liquibase-update-to-latest.xml (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/test/java/org/openmrs/api/AdministrationServiceTest.java (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • api/src/test/resources/org/openmrs/util/databasechange/database1_9To1_10UpgradeTest-dataSet.xml (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
  • webapp/src/main/webapp/WEB-INF/messages.properties (version 5ae0fef3975693ee53ae5c648c3785110645db9b)
• 

  Wyclif Luyima 11 May 2014 27e82ecd2036ee14fafbb00f90c533d11ab00e1a

  Upated Order.getPreviousOrder instead of making the field eagerly loaded in the mapping file - TRUNK-4368

  • api/src/main/java/org/openmrs/Order.java (version 27e82ecd2036ee14fafbb00f90c533d11ab00e1a)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateUtil.java (version 27e82ecd2036ee14fafbb00f90c533d11ab00e1a)
  • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version 27e82ecd2036ee14fafbb00f90c533d11ab00e1a)
  • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version 27e82ecd2036ee14fafbb00f90c533d11ab00e1a)
• 

  Wyclif Luyima 11 May 2014 a6392f0e2f7d4587107c3fa44afbf7ae1c74874d

  Allow editing discontinuation orders - TRUNK-4363
  Follow up - TRUNK-4363

  • api/src/main/java/org/openmrs/DrugOrder.java (version a6392f0e2f7d4587107c3fa44afbf7ae1c74874d)
  • api/src/main/java/org/openmrs/Order.java (version a6392f0e2f7d4587107c3fa44afbf7ae1c74874d)
  • api/src/test/java/org/openmrs/DrugOrderTest.java (version a6392f0e2f7d4587107c3fa44afbf7ae1c74874d)
  • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version a6392f0e2f7d4587107c3fa44afbf7ae1c74874d)
  • api/src/test/java/org/openmrs/OrderTest.java (version a6392f0e2f7d4587107c3fa44afbf7ae1c74874d)
• 

  Wyclif Luyima 09 May 2014 cba7fc9c222348b3afec1292fdbfbb05bac81eb8

  Changed enum comparisons to use == and !=
  Changed enum comparisons to use == and !=

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version cba7fc9c222348b3afec1292fdbfbb05bac81eb8)
• 

  Wyclif Luyima 09 May 2014 1d489ff5fc81ec42ec93871ced15aa567f556add

  Updated toString methods for Order and DrugOrder to prepend 'DC' to the returned value for DC orders

  • api/src/main/java/org/openmrs/DrugOrder.java (version 1d489ff5fc81ec42ec93871ced15aa567f556add)
  • api/src/main/java/org/openmrs/Order.java (version 1d489ff5fc81ec42ec93871ced15aa567f556add)
• 

  Wyclif Luyima 09 May 2014 23d894af3b1fc6d246a6ee76a5ef53fceb54251a

  Added static imports for order actions to OrderServiceImpl and moved setting of property values to a utility method  - TRUNK-4370

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 23d894af3b1fc6d246a6ee76a5ef53fceb54251a)
• 

  Wyclif Luyima 09 May 2014 a1ae46120384f7975a37d67ae48511889d4ca198

  Voiding and unvoiding discontinuation or revision orders should activate or deactivate the previousOrder  - TRUNK-4370
  Follow up  - TRUNK-4370

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

  Wyclif Luyima 08 May 2014 08373994c2c1def880f44f7502c8617133b31d4d

  Cleaned up orderserviceimpl

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 08373994c2c1def880f44f7502c8617133b31d4d)
  • api/src/test/java/org/openmrs/order/OrderUtilTest.java (version 08373994c2c1def880f44f7502c8617133b31d4d)
• 

  Wyclif Luyima 08 May 2014 aab4c2ee8673367815e880bca0ec0d58242a9650

  Removed private setter for Order.dateStopped

  • api/src/main/java/org/openmrs/Order.java (version aab4c2ee8673367815e880bca0ec0d58242a9650)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version aab4c2ee8673367815e880bca0ec0d58242a9650)
  • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version aab4c2ee8673367815e880bca0ec0d58242a9650)
  • api/src/test/java/org/openmrs/order/OrderUtilTest.java (version aab4c2ee8673367815e880bca0ec0d58242a9650)
• 

  Wyclif Luyima 08 May 2014 6beb0ecd79019aa38567c847c0d29b384bf4dd13

  Order.previousOrder is mapped incorrectly - TRUNK-4368

  • api/src/main/java/org/openmrs/Order.java (version 6beb0ecd79019aa38567c847c0d29b384bf4dd13)
  • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version 6beb0ecd79019aa38567c847c0d29b384bf4dd13)
  • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version 6beb0ecd79019aa38567c847c0d29b384bf4dd13)
• 

  Wyclif Luyima 08 May 2014 4def96325c2994cff972403243db775470cd1e54

  Cleaned up some code where local variables were getting created un necessarily

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 4def96325c2994cff972403243db775470cd1e54)
• 

  Rafal Korytkowski 07 May 2014 36a48b2dc1bfa137f6d8de5265ca91c0a8d34640

  TRUNK-4362 Corrected javadoc

  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 36a48b2dc1bfa137f6d8de5265ca91c0a8d34640)
• 

  Wyclif Luyima 06 May 2014 41c4577defb2e5017d7c3870cb30c160bf1af8f7

  Changed code that checks class equality of persistent objects to use the persistent class for hibernate proxies

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 41c4577defb2e5017d7c3870cb30c160bf1af8f7)
• 

  Wyclif Luyima 05 May 2014 65abeb9cc6409b718d2ffaba3ac9edda872b9b0f

  Updated DrugOrderValidator to make dosingType nullable

  • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 65abeb9cc6409b718d2ffaba3ac9edda872b9b0f)
  • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 65abeb9cc6409b718d2ffaba3ac9edda872b9b0f)
• 

  Wyclif Luyima 05 May 2014 09966b49a3f93a49c1a57fbabd0932dbfe0253f7

  Added missing drug_order rows to test data

  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 09966b49a3f93a49c1a57fbabd0932dbfe0253f7)
• 

  Rafal Korytkowski 05 May 2014 4a1bfd579047649f22177bbca3f48983bfe416c7

  TRUNK-4362 OrderService.getDiscontinuationOrder() should ignore voided orders

  • api/src/main/java/org/openmrs/api/OrderService.java (version 4a1bfd579047649f22177bbca3f48983bfe416c7)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version 4a1bfd579047649f22177bbca3f48983bfe416c7)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 4a1bfd579047649f22177bbca3f48983bfe416c7)
• 

  Wyclif Luyima 02 May 2014 79c7671f6f7cb2f8cd6cb153fb0d0ee05d6a8c05

  Updated changeset that creates DC orders to set start_date and date_stopped and added a unit test

  • api/src/main/java/org/openmrs/util/databasechange/CreateDiscontinueOrders.java (version 79c7671f6f7cb2f8cd6cb153fb0d0ee05d6a8c05)
  • api/src/main/resources/liquibase-update-to-latest.xml (version 79c7671f6f7cb2f8cd6cb153fb0d0ee05d6a8c05)
  • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version 79c7671f6f7cb2f8cd6cb153fb0d0ee05d6a8c05)
• 

  Wyclif Luyima 02 May 2014 c782f3b28b6a303ca30a4fbe84b8605a89e56d81

  Moved private members to the top of the file

  • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version c782f3b28b6a303ca30a4fbe84b8605a89e56d81)
• 

  Wyclif Luyima 02 May 2014 6036f40555ba31359e00f33021740df9836d3ac9

  Updated API to mark all DC orders as stopped as they get created

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 6036f40555ba31359e00f33021740df9836d3ac9)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 6036f40555ba31359e00f33021740df9836d3ac9)
• 

  Wyclif Luyima 01 May 2014 582164d63f7e8a479a388a53540a88f795d81349

  Follow up to update javadocs in PortletController - TRUNK-4358

  • web/src/main/java/org/openmrs/web/controller/PortletController.java (version 582164d63f7e8a479a388a53540a88f795d81349)
• 

  Wyclif Luyima 01 May 2014 ee3a641c82ad1acdea578ba11065313d48589f33

  removed regimen tab from patient dashboard according to TRUNK-4358

  • web/src/main/java/org/openmrs/web/controller/RegimenPortletController.java (version ee3a641c82ad1acdea578ba11065313d48589f33)
  • web/src/main/resources/openmrs-servlet.xml (version ee3a641c82ad1acdea578ba11065313d48589f33)
  • webapp/src/main/webapp/WEB-INF/view/patientDashboardForm.jsp (version ee3a641c82ad1acdea578ba11065313d48589f33)
• 

  Wyclif Luyima 01 May 2014 8db3e64f0d630e6b583c2397f7a74ebec5652778

  Added OrderService.getRevisionOrder
  Follow up

  • api/src/main/java/org/openmrs/api/OrderService.java (version 8db3e64f0d630e6b583c2397f7a74ebec5652778)
  • api/src/main/java/org/openmrs/api/db/OrderDAO.java (version 8db3e64f0d630e6b583c2397f7a74ebec5652778)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version 8db3e64f0d630e6b583c2397f7a74ebec5652778)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 8db3e64f0d630e6b583c2397f7a74ebec5652778)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 8db3e64f0d630e6b583c2397f7a74ebec5652778)
  • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 8db3e64f0d630e6b583c2397f7a74ebec5652778)
• 

  Wyclif Luyima 30 Apr 2014 5d2245130606ffbbfcaa82d8552690fcb98a1446

  Disable Hibernate cascading for Encounter.orders and Obs.order - TRUNK-4336
  Follow up - TRUNK-4336
  
  Follow up to address review comments - TRUNK-4336
  
  Follow up - TRUNK-4336
  
  Follow up - TRUNK-4336
  
  Follow up - TRUNK-4336
  
  Follow up - TRUNK-4336
  
  Follow up - TRUNK-4336

  • api/src/main/java/org/openmrs/Order.java (version 5d2245130606ffbbfcaa82d8552690fcb98a1446)
  • api/src/main/java/org/openmrs/api/db/hibernate/ChainingInterceptor.java (version 5d2245130606ffbbfcaa82d8552690fcb98a1446)
  • api/src/main/java/org/openmrs/api/db/hibernate/ImmutableEntityInterceptor.java (version 5d2245130606ffbbfcaa82d8552690fcb98a1446)
  • api/src/main/java/org/openmrs/api/db/hibernate/ImmutableOrderInterceptor.java (version 5d2245130606ffbbfcaa82d8552690fcb98a1446)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 5d2245130606ffbbfcaa82d8552690fcb98a1446)
  • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version 5d2245130606ffbbfcaa82d8552690fcb98a1446)
  • api/src/test/java/org/openmrs/OrderTest.java (version 5d2245130606ffbbfcaa82d8552690fcb98a1446)
  • api/src/test/java/org/openmrs/api/db/hibernate/ImmutableEntityInterceptorTest.java (version 5d2245130606ffbbfcaa82d8552690fcb98a1446)
  • api/src/test/java/org/openmrs/order/OrderUtilTest.java (version 5d2245130606ffbbfcaa82d8552690fcb98a1446)
  • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 5d2245130606ffbbfcaa82d8552690fcb98a1446)
  • api/src/test/java/org/openmrs/validator/OrderValidatorTest.java (version 5d2245130606ffbbfcaa82d8552690fcb98a1446)
• 

  Wyclif Luyima 29 Apr 2014 33a33e7027fab2a60815289bc69272fe4d440ba0

  Made DrugOrder.quantityUnits optional for out patient care setting

  • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 33a33e7027fab2a60815289bc69272fe4d440ba0)
  • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 33a33e7027fab2a60815289bc69272fe4d440ba0)
  • webapp/src/main/webapp/WEB-INF/messages.properties (version 33a33e7027fab2a60815289bc69272fe4d440ba0)
• 

  Wyclif Luyima 29 Apr 2014 3d5f7257a443313e8fea12dd828d62b80b937368

  make dosageInstructions required for all dosingTypes except SIMPLE as specify in TRUNK-4351 `

  • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 3d5f7257a443313e8fea12dd828d62b80b937368)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 3d5f7257a443313e8fea12dd828d62b80b937368)
  • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 3d5f7257a443313e8fea12dd828d62b80b937368)
• 

  Wyclif Luyima 29 Apr 2014 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 29 Apr 2014 2b9d02240a5c7d2ef30bf99829d9430c22b429db

  Fixed typo on liquibase changeset comment

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

  mogoodrich <mgoodrich@pih.org> 28 Apr 2014 1c56c9097a48399c238522106038f883eb95e49b

  TRUNK-4361: When merging patients, addresses from Non-Preferred Patients should not be set to preferrred

  • api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java (version 1c56c9097a48399c238522106038f883eb95e49b)
  • api/src/test/java/org/openmrs/api/PatientServiceTest.java (version 1c56c9097a48399c238522106038f883eb95e49b)
• 

  Wyclif Luyima 25 Apr 2014 c02f6a8ee51d47f37cca9f1a956f99cf9e9d5162

  Added logic that resets the accessibility of the orderNumber field when setting it via reflection

  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version c02f6a8ee51d47f37cca9f1a956f99cf9e9d5162)
• 

  Daniel Kayiwa 25 Apr 2014 4fa1e3784af0fdaab8dda83fb63ce70fca0d1a2d

  Remove Logic Module as a core module - TRUNK-3169

  • api/pom.xml (version 4fa1e3784af0fdaab8dda83fb63ce70fca0d1a2d)
  • api/src/main/java/org/openmrs/module/ModuleConstants.java (version 4fa1e3784af0fdaab8dda83fb63ce70fca0d1a2d)
  • api/src/test/java/org/openmrs/module/ModuleUtilTest.java (version 4fa1e3784af0fdaab8dda83fb63ce70fca0d1a2d)
  • webapp/src/main/webapp/WEB-INF/bundledModules/logic-0.5.2.omod (version 4fa1e3784af0fdaab8dda83fb63ce70fca0d1a2d)
• 

  Wyclif Luyima 23 Apr 2014 472cee3c89ebb9d4588deb6880bdc7e15ae2f9de

  Added tests for voiding and unvoiding orders

  • api/src/main/java/org/openmrs/api/OrderService.java (version 472cee3c89ebb9d4588deb6880bdc7e15ae2f9de)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 472cee3c89ebb9d4588deb6880bdc7e15ae2f9de)
• 

  Wyclif Luyima 23 Apr 2014 8af808f8634aa56bfae83b598ee0e277a9b89df3

  Changed id of changeset  to fix failing liquibase changesets in CI

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

  Wyclif Luyima 23 Apr 2014 30dd63710eced1525a1f34bd2f600daf02255438

  Fixed failing liquibase changesets

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

  Wyclif Luyima 23 Apr 2014 8630efb2ec0a668ba20db628f23053cf214ad110

  Changed custom liquibase changeset that generates DC orders  to set discontinued_by value as the value for orderer and creator  fields of the generated DC orders, also added a changeset that converts empty strings to null for drug.strength column

  • api/src/main/java/org/openmrs/util/databasechange/CreateDiscontinueOrders.java (version 8630efb2ec0a668ba20db628f23053cf214ad110)
  • api/src/main/resources/liquibase-update-to-latest.xml (version 8630efb2ec0a668ba20db628f23053cf214ad110)
  • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version 8630efb2ec0a668ba20db628f23053cf214ad110)
  • api/src/test/java/org/openmrs/util/databasechange/DatabaseUpgradeTestUtil.java (version 8630efb2ec0a668ba20db628f23053cf214ad110)
• 

  Wyclif Luyima 23 Apr 2014 0a54ebeecf539ba7e58eb527bb7922b9f36651e3

  Moved some utility methods from DatabaseUtil to UpgradeUtil

  • api/src/main/java/org/openmrs/util/DatabaseUtil.java (version 0a54ebeecf539ba7e58eb527bb7922b9f36651e3)
  • api/src/main/java/org/openmrs/util/UpgradeUtil.java (version 0a54ebeecf539ba7e58eb527bb7922b9f36651e3)
  • api/src/main/java/org/openmrs/util/databasechange/CreateCodedOrderFrequencyForDrugOrderFrequencyChangeset.java (version 0a54ebeecf539ba7e58eb527bb7922b9f36651e3)
  • api/src/main/java/org/openmrs/util/databasechange/MigrateDrugOrderFrequencyToCodedOrderFrequencyChangeset.java (version 0a54ebeecf539ba7e58eb527bb7922b9f36651e3)
• 

  Rafal Korytkowski 23 Apr 2014 0d869134f46037e128dc312306cafb89114f8118

  TRUNK-4336 Disable Hibernate cascading for Encounter.orders and Obs.order

  • api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java (version 0d869134f46037e128dc312306cafb89114f8118)
  • api/src/main/resources/org/openmrs/api/db/hibernate/Encounter.hbm.xml (version 0d869134f46037e128dc312306cafb89114f8118)
  • api/src/main/resources/org/openmrs/api/db/hibernate/Obs.hbm.xml (version 0d869134f46037e128dc312306cafb89114f8118)
  • api/src/test/java/org/openmrs/api/EncounterServiceTest.java (version 0d869134f46037e128dc312306cafb89114f8118)
• 

  Wyclif Luyima 22 Apr 2014 e549c222655bd0c050163f055d13805acd959229

  Added missing liquibase changeset comments

  • api/src/main/java/org/openmrs/util/databasechange/CreateDiscontinueOrders.java (version e549c222655bd0c050163f055d13805acd959229)
  • api/src/main/resources/liquibase-update-to-latest.xml (version e549c222655bd0c050163f055d13805acd959229)
• 

  Wyclif Luyima 22 Apr 2014 2e2340b8a6304808285823ca71fa3e1f2f963e1f

  Cleaned up unit tests and in OrderService and Database1_9_7UpgradeTest to use junit rules instead of expected attribute of the @Test annotation

  • api/src/main/java/org/openmrs/util/databasechange/CheckDrugOrderUnitAndFrequencyTextNotMappedToConcepts.java (version 2e2340b8a6304808285823ca71fa3e1f2f963e1f)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 2e2340b8a6304808285823ca71fa3e1f2f963e1f)
  • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version 2e2340b8a6304808285823ca71fa3e1f2f963e1f)
• 

  Wyclif Luyima 22 Apr 2014 015077bfe569082836868981d5a343d87d0c6ecc

  Cleaned up unit tests and @should in OrderService

  • api/src/main/java/org/openmrs/api/OrderService.java (version 015077bfe569082836868981d5a343d87d0c6ecc)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 015077bfe569082836868981d5a343d87d0c6ecc)
• 

  Wyclif Luyima 21 Apr 2014 1d95c409932ccc9019d022e3ee892acc797f9c2f

  Added missing precondition fail actions, added more unit tests around upgrading the order_type table

  • api/src/main/resources/liquibase-update-to-latest.xml (version 1d95c409932ccc9019d022e3ee892acc797f9c2f)
  • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version 1d95c409932ccc9019d022e3ee892acc797f9c2f)
  • api/src/test/resources/org/openmrs/util/databasechange/UpgradeTest-otherOrderTypes.xml (version 1d95c409932ccc9019d022e3ee892acc797f9c2f)
• 

  Wyclif Luyima 21 Apr 2014 210f08b4e9e7c61ecae6c9bd7aae95e383aee203

  Removed @Ignore from PatientDataUnvoidHandlerTest

  • api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java (version 210f08b4e9e7c61ecae6c9bd7aae95e383aee203)
• 

  Wyclif Luyima 21 Apr 2014 fb110d4fb2811e55e3498714cc8c240a368b0a0c

  Updated demo data to remove other order type rows that are not for drug order, updated the fail message when order entry type table can't be updated - TRUNK-4341

  • api/src/main/resources/liquibase-update-to-latest.xml (version fb110d4fb2811e55e3498714cc8c240a368b0a0c)
  • webapp/src/main/resources/liquibase-demo-data.zip (version fb110d4fb2811e55e3498714cc8c240a368b0a0c)
• 

  Wyclif Luyima 21 Apr 2014 33871522223f5a191d8ac2f40bb5581295cb5921

  Follow up to address some issues - TRUNK-4347
  Applying auto format changes - TRUNK-4347

  • api/src/main/java/org/openmrs/api/OrderService.java (version 33871522223f5a191d8ac2f40bb5581295cb5921)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 33871522223f5a191d8ac2f40bb5581295cb5921)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 33871522223f5a191d8ac2f40bb5581295cb5921)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 33871522223f5a191d8ac2f40bb5581295cb5921)
• 

  Wyclif Luyima 21 Apr 2014 f3836a4414361d00837c1ba684b8bc3e33738794

  added getDrugRoutes function as specified in TRUNK-4347

  • api/src/main/java/org/openmrs/api/OrderService.java (version f3836a4414361d00837c1ba684b8bc3e33738794)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version f3836a4414361d00837c1ba684b8bc3e33738794)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version f3836a4414361d00837c1ba684b8bc3e33738794)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version f3836a4414361d00837c1ba684b8bc3e33738794)