=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceListAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceListAction.java	2012-05-05 11:16:25 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceListAction.java	2012-05-14 09:01:41 +0000
@@ -181,6 +181,8 @@
             Iterator<InventoryTypeAttribute> iterator = inventoryTypeAttributeList.iterator();
             while( iterator.hasNext() )
             {
+                iterator.next();
+                
                 if( count > 3 )
                     iterator.remove();
                 

=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectEquipment.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectEquipment.vm	2012-05-05 11:16:25 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectEquipment.vm	2012-05-14 09:01:41 +0000
@@ -1,5 +1,5 @@
 
-<input type="hidden" id='selectedOrgunitID' />
+<input type="hidden" id='selectedOrgunitID' value="$!organisationUnit.id" />
 
 <div id='selectDiv'>