OpenMRS

Timestamp:

08/06/08 17:17:55 (5 months ago)

Author:

mseaton

Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/Order.java (modified) (3 diffs)

openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/Order.java

@@ -65 +65 @@
-        private Date discontinuedDate;
-        private Concept discontinuedReason;
+        private String accessionNumber;
-        private Boolean voided = false;
-        private User voidedBy;
@@ -131 +132 @@
-                target.setDiscontinuedReason(getDiscontinuedReason());
-                target.setDiscontinuedBy(getDiscontinuedBy());
+                target.setAccessionNumber(getAccessionNumber());
-                target.setVoided(getVoided());
-                target.setVoidedBy(getVoidedBy());
@@ -378 +380 @@
-        }
-
+        /**
+         * @return Returns the accessionNumber.
+         */
+        public String getAccessionNumber() {
+                return accessionNumber;
+        }
+
+        /**
+         * @param accessionNumber The accessionNumber to set.
+         */
+        public void setAccessionNumber(String accessionNumber) {
+                this.accessionNumber = accessionNumber;
+        }
+        
-        /**
-         * @return Returns the orderer.