Merge remote-tracking branch 'origin/master'

gaiaehr · Apr 4, 2016 · e1a43ee · e1a43ee
2 parents f5c7f6d + 5340c8e
commit e1a43ee
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/model/patient/Medications.js b/app/model/patient/Medications.js
@@ -221,7 +221,12 @@ Ext.define('App.model.patient.Medications', {
 			name: 'created_date',
 			type: 'date',
 			dateFormat: 'Y-m-d H:i:s'
-		}
+		},
+        {
+            name: 'overridden',
+            type: 'bool',
+            comment: 'This is used by the Drug-To-Drug Interactions (MODULE)'
+        }
 	],
 	proxy: {
 		type: 'direct',