OpenMRS

Timestamp:

07/17/08 15:20:10 (6 months ago)

Author:

catullus

Message:

sync-bidrectional: partly merge

Files:

• openmrs/branches/data_synchronization_bidirectional (modified) (1 prop)
• openmrs/branches/data_synchronization_bidirectional/metadata/api/hibernate/org/openmrs/api/db/hibernate/PatientState.hbm.xml (modified) (2 diffs)

openmrs/branches/data_synchronization_bidirectional/metadata/api/hibernate/org/openmrs/api/db/hibernate/PatientState.hbm.xml

@@ -23 +23 @@
-                <property name="dateCreated" type="java.util.Date" column="date_created" not-null="true" length="19" />
-                
+                <property name="dateChanged" type="java.util.Date" column="date_changed" length="19" />
+                
-                <property name="voided" type="java.lang.Boolean" column="voided" length="1" not-null="true" />
-                
@@ -35 +37 @@
-                <many-to-one name="creator" class="User" column="creator" not-null="true" />
-                
+                <many-to-one name="changedBy" class="User" column="changed_by" />
+                
-                <many-to-one name="voidedBy" class="User" column="voided_by" />
-