=== modified file 'local/in/dhis-in-api/pom.xml'
--- local/in/dhis-in-api/pom.xml	2014-04-26 11:27:06 +0000
+++ local/in/dhis-in-api/pom.xml	2014-07-25 10:59:27 +0000
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis</artifactId>
-	<version>2.16-SNAPSHOT</version>
+	<version>2.17-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-api</artifactId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-configuration/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-configuration/pom.xml	2014-04-26 11:27:06 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/pom.xml	2014-07-25 10:59:27 +0000
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-	<version>2.16-SNAPSHOT</version>
+	<version>2.17-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-configuration</artifactId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-lookup/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-lookup/pom.xml	2014-04-26 11:27:06 +0000
+++ local/in/dhis-in-services/dhis-in-service-lookup/pom.xml	2014-07-25 10:59:27 +0000
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.hisp.dhis</groupId>
 		<artifactId>dhis-in-services</artifactId>
-		<version>2.16-SNAPSHOT</version>
+		<version>2.17-SNAPSHOT</version>
 	</parent>
   
   <artifactId>dhis-in-service-lookup</artifactId>

=== modified file 'local/in/dhis-in-services/pom.xml'
--- local/in/dhis-in-services/pom.xml	2014-04-26 11:27:06 +0000
+++ local/in/dhis-in-services/pom.xml	2014-07-25 10:59:27 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis</artifactId>
-    <version>2.16-SNAPSHOT</version>
+    <version>2.17-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-services</artifactId>

=== modified file 'local/in/dhis-web-maintenance-in/pom.xml'
--- local/in/dhis-web-maintenance-in/pom.xml	2014-04-26 11:27:06 +0000
+++ local/in/dhis-web-maintenance-in/pom.xml	2014-07-25 10:59:27 +0000
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.hisp.dhis</groupId>
 		<artifactId>dhis-web</artifactId>
-		<version>2.16-SNAPSHOT</version>
+		<version>2.17-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>dhis-web-maintenance-in</artifactId>

=== modified file 'local/in/dhis-web-maintenance-pbf/pom.xml'
--- local/in/dhis-web-maintenance-pbf/pom.xml	2014-04-26 11:27:06 +0000
+++ local/in/dhis-web-maintenance-pbf/pom.xml	2014-07-25 10:59:27 +0000
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.hisp.dhis</groupId>
 		<artifactId>dhis-web</artifactId>
-		<version>2.16-SNAPSHOT</version>
+		<version>2.17-SNAPSHOT</version>
 	</parent>
 	<repositories>
     <repository>

=== modified file 'local/in/dhis-web-maintenance-rbf/pom.xml'
--- local/in/dhis-web-maintenance-rbf/pom.xml	2014-04-26 11:27:06 +0000
+++ local/in/dhis-web-maintenance-rbf/pom.xml	2014-07-25 10:59:27 +0000
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.hisp.dhis</groupId>
 		<artifactId>dhis-web</artifactId>
-		<version>2.16-SNAPSHOT</version>
+		<version>2.17-SNAPSHOT</version>
 	</parent>
 	<repositories>
     <repository>

=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java	2014-07-23 11:47:17 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java	2014-07-25 10:59:27 +0000
@@ -336,7 +336,7 @@
         String orgUnitBranchIds = "-1";
         for( OrganisationUnit orgUnit : orgUnitBranch )
         {
-        	orgUnitBranchIds += "," + orgUnit.getId();
+            orgUnitBranchIds += "," + orgUnit.getId();
         }
         
         if( orgUnitGroup != null )

=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadNextPrePeriodsAction.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadNextPrePeriodsAction.java	2014-04-26 11:27:06 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadNextPrePeriodsAction.java	2014-07-25 10:59:27 +0000
@@ -131,6 +131,7 @@
         for ( Period period : periods )
         {
             period.setName( format.formatPeriod( period ) );
+           
         }
 
         return SUCCESS;

=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateUtilizationRateStore.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateUtilizationRateStore.java	2014-06-20 10:21:56 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateUtilizationRateStore.java	2014-07-25 10:59:27 +0000
@@ -142,7 +142,7 @@
                 
                 String value = startRange + ":" + endRange + ":" + tariff;
                 utilizationRatesMap.put( dataElementId, value );
-                //System.out.println( dataElementId + " : " + value );
+                System.out.println( dataElementId + " : " + value );
             }
         }
         catch( Exception e )

=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/prevNextPeriods.js'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/prevNextPeriods.js	2014-04-26 11:27:06 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/prevNextPeriods.js	2014-07-25 10:59:27 +0000
@@ -17,7 +17,7 @@
 		function( json ) {
 			
 			for ( i in json.periods ) {
-	    		addOptionToList( selectedList, json.periods[i].isoDate, json.periods[i].name );
+	    		addOptionToList( selectedList, json.periods[i].externalId, json.periods[i].name );
 	    	}
 			
 		} );

=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonPeriods.vm'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonPeriods.vm	2014-04-26 11:27:06 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonPeriods.vm	2014-07-25 10:59:27 +0000
@@ -7,7 +7,7 @@
     "startDate": "$!format.formatDate( ${period.startDate} )",
     "endDate": "$!format.formatDate( ${period.endDate} )",
     "name": "$!format.formatPeriod( ${period} )",
-    "externalId": "$!{period.externalId}",
+    "externalId": "$!{period.getStartDateString()}:$!{period.getEndDateString()}",
 	"isoDate": "$!{period.isoDate}"
   }#if( $velocityCount < $size ),#end    
 #end

=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/pbfReportForm.vm'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/pbfReportForm.vm	2014-06-20 10:21:56 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/pbfReportForm.vm	2014-07-25 10:59:27 +0000
@@ -67,7 +67,7 @@
 		
 		var orgUnitGroupName = tempOrgUnitGroupNameMap[orgUnitId];
 		
-		//alert( orgUnitGroupName );
+		alert( orgUnitGroupName );
 		
 		
 		if( rprDesign == "MH_PATIENT_ALLOWANCE_CLAIM")
@@ -90,6 +90,12 @@
 				window.location.href =  birtReportURL;
 			}
 			
+			else 
+			{ 
+				showWarningMessage( "Selected Facility Not Related to any group" );
+				//return false; 
+			}		
+			
 		}
 		
 		else if( rprDesign == "HEALTH_PROVIDER_PAYMENT_CLAIM")
@@ -111,7 +117,11 @@
 				var birtReportURL = "http://178.79.144.205:8989/birt/run?__report=/home/dqa/tomcat_pbf_laos/webapps/birt/report/healthprovider_DH_report4.rptdesign&__format="+reportFormat+"&startDate="+startPeriod+"&endDate="+endPeriod+"&orgUnit="+orgUnitId;
 				window.location.href =  birtReportURL;
 			}
-			
+			else 
+			{ 
+				showWarningMessage( "Selected Facility Not Related to any group" );
+				//return false; 
+			}					
 		}		
 		
 		else if( rprDesign == "MATERNAL_HEALTH")
@@ -133,7 +143,11 @@
 				var birtReportURL = "http://178.79.144.205:8989/birt/run?__report=/home/dqa/tomcat_pbf_laos/webapps/birt/report/Mathealth_DH.rptdesign&__format="+reportFormat+"&startDate="+startPeriod+"&endDate="+endPeriod+"&orgUnit="+orgUnitId;
 				window.location.href =  birtReportURL;
 			}
-			
+			else 
+			{ 
+				showWarningMessage( "Selected Facility Not Related to any group" );
+				//return false; 
+			}					
 		}
 		
 		else if( rprDesign == "MONTHLY_PPS")
@@ -155,9 +169,19 @@
 				var birtReportURL = "http://178.79.144.205:8989/birt/run?__report=/home/dqa/tomcat_pbf_laos/webapps/birt/report/monthly_pps.rptdesign&__format="+reportFormat+"&startDate="+startPeriod+"&endDate="+endPeriod+"&orgUnit="+orgUnitId;
 				window.location.href =  birtReportURL;
 			}
-			
+			else 
+			{ 
+				showWarningMessage( "Selected Facility Not Related to any group" );
+				//return false; 
+			}					
 		}		
 		
+		else 
+		{ 
+			showWarningMessage( "Design file is not set" );
+			//return false; 
+		}			
+		
 		//alert( orgunit + "--" + orgUnitId )
 		
 		//alert( rprDesign )

=== modified file 'local/in/pom.xml'
--- local/in/pom.xml	2014-07-04 09:38:52 +0000
+++ local/in/pom.xml	2014-07-25 10:59:27 +0000
@@ -5,7 +5,7 @@
   
   <groupId>org.hisp.dhis</groupId>
   <artifactId>dhis-local</artifactId>
-  <version>2.16-SNAPSHOT</version>
+  <version>2.17-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Local India Modules</name>