OpenMRS

Timestamp:

05/09/08 21:34:56 (7 months ago)

Author:

catullus

Message:

data_synchronization_bidirectionaly: merge from tunk [4129:4157].

Files:

• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernatePatientDAO.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/OrderServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/hl7/handler/ADTA28Handler.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/order/DrugOrderSupport.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/reporting/export/DataExportFunctions.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/util/OpenmrsConstants.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/PortletController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/patient/NewPatientFormController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/taglib/ConceptTag.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/taglib/GlobalPropertyTag.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/BaseContextSensitiveTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/CreateInitialDataSet.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/AdministrationServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/PatientServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/arden/ArdenServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/db/hibernate/HibernateAlertDAOTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/include/PatientServiceTest-createPatient.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/include/PatientServiceTest-findPatients.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/include/PatientServiceTest-findPatients.xml) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/notification/MessageServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/messages.properties (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/taglibs/openmrs.tld (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/admin/reports/dataExportForm.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/admin/reports/include/simpleColumns.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/portlets/patientHeader.jsp (modified) (view diffs)