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/Location.hbm.xml (modified) (1 diff)

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

@@ -58 +58 @@
-                </many-to-one>
-
+        <many-to-one name="retiredBy" class="org.openmrs.User"
+            column="retired_by" />
+        <property name="dateRetired" type="java.util.Date"
+            column="date_retired" length="19" />
+        <property name="retireReason" type="java.lang.String"
+            column="retire_reason" length="255" />
+        <property name="retired" type="boolean" column="retired"
+            length="1" not-null="true" />
+
-        </class>
-</hibernate-mapping>