=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-11-17 22:18:59 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-11-18 14:05:39 +0000
@@ -1380,8 +1380,8 @@
  */
 dhis2.de.optionValidWithinPeriod = function( option, period )
 {
-    return ( !option.start || option.start <= dhis2.de.periodChoices[ period ].end )
-        && ( !option.end || option.end >= dhis2.de.periodChoices[ period ].start )
+    return ( !option.start || option.start <= dhis2.de.periodChoices[ period ].endDate )
+        && ( !option.end || option.end >= dhis2.de.periodChoices[ period ].startDate )
 }
 
 /**