=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java	2012-04-21 12:57:24 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java	2012-05-01 06:15:42 +0000
@@ -18,6 +18,8 @@
 
     public static final String TYPE_COMBO = "COMBO";
 
+    public static final String TYPE_CATALOG = "CATALOG";
+    
     private int id;
     
     private String name;

=== added file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAttributesAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAttributesAction.java	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAttributesAction.java	2012-05-01 06:15:42 +0000
@@ -0,0 +1,52 @@
+package org.hisp.dhis.coldchain.inventory.action;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute;
+import org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeService;
+
+import com.opensymphony.xwork2.Action;
+
+public class GetInventoryTypeAttributesAction implements Action
+{
+    // -------------------------------------------------------------------------
+    // Dependency
+    // -------------------------------------------------------------------------
+    
+    private InventoryTypeAttributeService inventoryTypeAttributeService;
+    
+    public void setInventoryTypeAttributeService( InventoryTypeAttributeService inventoryTypeAttributeService )
+    {
+        this.inventoryTypeAttributeService = inventoryTypeAttributeService;
+    }
+
+    // -------------------------------------------------------------------------
+    // Input & Output
+    // -------------------------------------------------------------------------
+    private List<InventoryTypeAttribute> inventoryTypeAttributes;
+    
+    public List<InventoryTypeAttribute> getInventoryTypeAttributes()
+    {
+        return inventoryTypeAttributes;
+    }
+
+    // -------------------------------------------------------------------------
+    // Action implementation
+    // -------------------------------------------------------------------------
+    public String execute() throws Exception
+    {
+        inventoryTypeAttributes = new ArrayList<InventoryTypeAttribute>( inventoryTypeAttributeService.getAllInventoryTypeAttributes() );
+        
+        for( InventoryTypeAttribute inventoryTypeAttribute : inventoryTypeAttributes )
+        {
+            System.out.println( "ID---" + inventoryTypeAttribute.getId() );
+            System.out.println( "Name---" + inventoryTypeAttribute.getName());
+            System.out.println( "Discription---" + inventoryTypeAttribute.getDescription() );
+            System.out.println( "ValueType---" + inventoryTypeAttribute.getValueType() );
+        }
+        return SUCCESS;
+    }
+
+}
+

=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/ShowUpdateInventoryTypeAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/ShowUpdateInventoryTypeAction.java	2012-04-26 10:00:48 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/ShowUpdateInventoryTypeAction.java	2012-05-01 06:15:42 +0000
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.hisp.dhis.coldchain.catalog.CatalogType;
 import org.hisp.dhis.coldchain.catalog.CatalogTypeService;
 import org.hisp.dhis.coldchain.inventory.InventoryType;
 import org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute;
@@ -29,6 +30,13 @@
     {
         this.inventoryTypeAttributeService = inventoryTypeAttributeService;
     }
+    
+    private CatalogTypeService catalogTypeService;
+
+    public void setCatalogTypeService( CatalogTypeService catalogTypeService )
+    {
+        this.catalogTypeService = catalogTypeService;
+    }
     // -------------------------------------------------------------------------
     // Input/Output
     // -------------------------------------------------------------------------
@@ -59,7 +67,14 @@
     {
         return selInventoryTypeAttributes;
     }
+    
+    private List<CatalogType> catalogTypes;
 
+    public List<CatalogType> getCatalogTypes()
+    {
+        return catalogTypes;
+    }
+    
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
@@ -67,6 +82,8 @@
     {
         inventoryType = inventoryTypeService.getInventoryType( Integer.parseInt( id ) );
         
+        catalogTypes =  new ArrayList<CatalogType>( catalogTypeService.getAllCatalogTypes() );
+        
         availInventoryTypeAttributes = new ArrayList<InventoryTypeAttribute>( inventoryTypeAttributeService.getAllInventoryTypeAttributes() );
         
         selInventoryTypeAttributes = new ArrayList<InventoryTypeAttribute>( inventoryType.getInventoryTypeAttributes() );

=== modified file 'local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml	2012-04-30 11:24:11 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml	2012-05-01 06:15:42 +0000
@@ -329,6 +329,7 @@
         scope="prototype">
         <property name="inventoryTypeAttributeService" ref="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeService" />
         <property name="inventoryTypeService" ref="org.hisp.dhis.coldchain.inventory.InventoryTypeService" />
+		<property name="catalogTypeService" ref="org.hisp.dhis.coldchain.catalog.CatalogTypeService" />
     </bean>
     <bean id="org.hisp.dhis.coldchain.inventory.action.UpdateInventoryTypeAction"
         class="org.hisp.dhis.coldchain.inventory.action.UpdateInventoryTypeAction"
@@ -347,6 +348,14 @@
         scope="prototype">
         <property name="inventoryTypeService" ref="org.hisp.dhis.coldchain.inventory.InventoryTypeService" />
     </bean>
+	
+	<!-- InventoryType Attributes -->
+    <bean id="org.hisp.dhis.coldchain.inventory.action.GetInventoryTypeAttributesAction"
+        class="org.hisp.dhis.coldchain.inventory.action.GetInventoryTypeAttributesAction"
+        scope="prototype">
+        <property name="inventoryTypeAttributeService" ref="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeService" />
+    </bean>	
+		
 <!-- EquipmentDetails -->
     <bean id="org.hisp.dhis.coldchain.equipment.action.EquipmentSelectAction"
         class="org.hisp.dhis.coldchain.equipment.action.EquipmentSelectAction"

=== modified file 'local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties'
--- local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties	2012-04-30 11:24:11 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties	2012-05-01 06:15:42 +0000
@@ -1,11 +1,11 @@
 
 coldchain = Cold Chain
 coldchain_management = Cold chain management
-coldchain_catalog_type_attribute_management = Cold chain catalog type attribute management
+coldchain_catalog_type_attribute_management = Cold chain catalogtype attribute management
 filter_by_name = Filter by name
-catalogType_attribute = Catalog type attribute
-create_new_catalog_type_attribute = Create new catalog type attribute
-catalog_type_attribute_details = Catalog type attribute details
+catalogType_attribute = Catalogtype attribute
+create_new_catalog_type_attribute = Create new catalogtype attribute
+catalog_type_attribute_details = Catalogtype attribute details
 mandatory = Mandatory
 no_of_char = Number of characters
 attribute_combo_type = Predefined value
@@ -14,32 +14,32 @@
 add_more_option = Add option
 at_least_2_option = Please add at least two attribute options
 remove_option = Remove option
-confirm_delete_catalogType_attribute = Are you sure you want to delete catalog type attribute?
-warning_delete_catalogType_attribute_option = This option has relationship with catalog type attribute value. You must not delete it.
+confirm_delete_catalogType_attribute = Are you sure you want to delete catalogtype attribute?
+warning_delete_catalogType_attribute_option = This option has relationship with catalogtype attribute value. You must not delete it.
 success_delete_ctalogType_attribute_option = Delete catalog type attribute option successfully.
-error_delete_ctalogType_attribute_option = Can not find catalog type attribute option to delete.
-edit_catalogType_attribute = Edit catalog type attribute
-catalogType_attribute_details = Catalog type attribute details
-error_delete_catalogType_attribute_option = Can not find catalog type attribute option to delete.
+error_delete_ctalogType_attribute_option = Can not find catalogtype attribute option to delete.
+edit_catalogType_attribute = Edit catalogtype attribute
+catalogType_attribute_details = Catalogtype attribute details
+error_delete_catalogType_attribute_option = Can not find catalogtype attribute option to delete.
 name_in_use = Name in use
 everything_is_ok = Everything is ok
-catalogType = Catalog type
-confirm_delete = Are you sure you want to delete this catalog type?
-catalogType_management = Catalog type management
-available_catalogType_attribute = Available Catalog type attributes
-selected_catalogType_attribute = Selected data catalog type attributes
-create_new_catalogType = Create new catalog type
-catalogType_attributes = Catalog type attributes
-edit_catalogType = Edit catalog type
-catalog_type_details = Details of catalog type
+catalogType = Catalogtype
+confirm_delete = Are you sure you want to delete this catalogtype?
+catalogType_management = Catalogtype management
+available_catalogType_attribute = Available Catalogtype attributes
+selected_catalogType_attribute = Selected data catalogtype attributes
+create_new_catalogType = Create new catalogtype
+catalogType_attributes = Catalogtype attributes
+edit_catalogType = Edit catalogtype
+catalog_type_details = Details of catalogtype
 object_not_deleted_associated_by_objects = Object not deleted because it is associated by objects of type
-confirm_delete_catalog_type = Are you sure you want to delete this catalog type?
+confirm_delete_catalog_type = Are you sure you want to delete this catalogtype?
 duplicate_names = Name is already in use
-no_of_catalogTypeAttributes = Number of catalog type attributes to be collected
+no_of_catalogTypeAttributes = Number of catalogtype attributes to be collected
 catalog = Catalog
 catalog_management = Catalog management
 add_new_catalog = Add new catalog
-please_select_catalog_type = Please select catalog type
+please_select_catalog_type = Please select catalogtype
 please_select = Please select
 confirm_delete_catalog = Are you sure you want to delete catalog?
 edit_catalog = Edit catalog
@@ -52,3 +52,14 @@
 inventorytype_attribute = Inventorytype attribute
 create_new_inventorytype_attribute = Create new inventorytype attribute
 inventorytype_attribute_details = Inventorytype attribute details
+create_new_inventorytype = Create new inventorytype
+confirm_delete_inventorytype_attribute = Are you sure you want to delete inventorytype attribute?
+tracking = Tracking
+available_inventorytype_attributes = Available inventorytype attributes
+selected_inventorytype_attributes = Selected data inventorytype attributes
+confirm_delete_inventorytype = Are you sure you want to delete inventorytype?
+inventorytype = Inventorytype
+inventory = Inventory
+inventorytype_management = Inventorytype management
+edit_inventorytype = Edit inventorytype
+inventorytype_details = Details inventorytype

=== modified file 'local/in/dhis-web-coldchain/src/main/resources/struts.xml'
--- local/in/dhis-web-coldchain/src/main/resources/struts.xml	2012-04-30 11:24:11 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/struts.xml	2012-05-01 06:15:42 +0000
@@ -343,6 +343,14 @@
             <result name="success" type="velocity-json">/dhis-web-coldchain/jsonInventoryType.vm</result>
             <param name="onExceptionReturn">plainTextError</param>
         </action>
+	
+	<!-- InventoryType Attributes -->
+	<action name="getInventoryTypeAttributes" class="org.hisp.dhis.coldchain.inventory.action.GetInventoryTypeAttributesAction">
+		<result name="success" type="velocity-json">/dhis-web-coldchain/jsonInventoryTypeAttributes.vm</result>
+		<param name="onExceptionReturn">plainTextError</param>
+	</action>	
+	
+	
 
 <!-- EquipmentDetails -->
         <action name="enquipmentSelect"

=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeAttributeForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeAttributeForm.vm	2012-04-21 12:57:24 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeAttributeForm.vm	2012-05-01 06:15:42 +0000
@@ -49,6 +49,7 @@
                 <option value="YES/NO">$i18n.getString( "yes_no" )</option>
                 <option value="DATE">$i18n.getString( "date" )</option>
                 <option value="COMBO">$i18n.getString( "attribute_combo_type" )</option>
+                <option value="CATALOG">$i18n.getString( "catalog" )</option>
             </select>
         </td>
         <td></td>

=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeForm.vm	2012-04-26 10:00:48 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeForm.vm	2012-05-01 06:15:42 +0000
@@ -1,19 +1,18 @@
-
-<script>
-	
-jQuery(document).ready(function() {
-    validation2('addInventoryTypeForm', function(form) {
-        form.submit();
-    }, {
-        'beforeValidateHandler' : function() {
-            selectAllById('selectedList');
-        },
-    });
-
-    checkValueIsExist("name", "validateInventoryType.action");
-
-});
-	
+<script type="text/javascript" src="javascript/addInventoryTypeForm.js"></script>
+<script type="text/javascript">
+	jQuery("#availableInventoryTypeAttributeList").dhisAjaxSelect({
+		source: "getInventoryTypeAttributes.action",
+		iterator: "inventoryTypeAttributes",
+		connectedTo: 'selectedInventoryTypeAttributeList',
+		handler: function(item) {
+			var option = jQuery("<option />");
+			option.text( item.name );
+			option.attr( "value", item.id );
+			
+			return option;
+			
+		}
+	});	
 </script>
 <h3>$i18n.getString( "create_new_inventorytype" )</h3>
 <form id="addInventoryTypeForm" action="addInventoryType.action" method="post" >
@@ -48,48 +47,51 @@
     </tr>
             
     <tr>
-        <td><label for="valueType">$i18n.getString( "catalog_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+        <td><label for="catalogType">$i18n.getString( "catalogType" )</label></td>
         <td>
             <select id="catalogType" name="catalogType">
-				#foreach( $catalogType in $catalogTypes )
-					<option value="$catalogType.id">$catalogType.name</option>
-				#end
+            	<option value="">[$i18n.getString( "please_select_catalog_type" )]</option>
+					#foreach( $catalogType in $catalogTypes )
+						<option value="$catalogType.id">$catalogType.name</option>
+					#end
             </select>
         </td>
         <td></td>
     </tr>  
     
     </tbody>
+    
 	</table>
-
-    <br/>&nbsp;
-
-  <table id="dataElementSelectionArea">
+	
+	<br/>&nbsp;
+  <table id="inventoryTypeMembersArea">
     <col style="width: 450px"/>
     <col/>
     <col style="width: 450px"/>
     <thead>
       <tr>
-        <th>$i18n.getString( "available_data_elements" )</th>
+        <th>$i18n.getString( "available_inventorytype_attributes" )</th>
         <th>$i18n.getString( "filter" )</th>
-        <th>$i18n.getString( "selected_data_elements" )</th>
+        <th>$i18n.getString( "selected_inventorytype_attributes" )</th>
       </tr>
     </thead>
     <tbody>
       <tr>
         <td>
-          <select id="availableList" name="availableList" multiple="multiple" style="height: 200px; width: 100%; margin-top: 45px;" ondblclick="moveSelectedById( 'availableList', 'selectedList' )">
-			#foreach( $inventoryTypeAttribute in $inventoryTypeAttributes )
-				<option value="$inventoryTypeAttribute.id">$inventoryTypeAttribute.name</option>
-			#end			
+          <select id="availableInventoryTypeAttributeList" name="availableInventoryTypeAttributeList" multiple="multiple" style="height: 200px; width: 100%; margin-top: 45px;" ondblclick="moveSelectedById( 'availableInventoryTypeAttributeList', 'selectedInventoryTypeAttributeList' )">
+			##foreach( $inventoryTypeAttribute in $inventoryTypeAttributes )
+				<!--<option value="$inventoryTypeAttribute.id">$inventoryTypeAttribute.name</option>-->
+			##end			
           </select>
         </td>
         <td>
-            <input type="button" value="&gt;" title="$i18n.getString( 'move_selected' )" style="width:50px" onClick="moveSelectedById( 'availableList', 'selectedList' )"/><br/>
-            <input type="button" value="&lt;" title="$i18n.getString( 'remove_selected' )" style="width:50px" onClick="moveSelectedById( 'selectedList', 'availableList' )"/><br/>
+          	<input type="button" value="&gt;" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'availableInventoryTypeAttributeList' );"/><br/>
+            <input type="button" value="&lt;" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'selectedInventoryTypeAttributeList' );"/><br/>
+			<input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'availableInventoryTypeAttributeList' );"/><br/>
+			<input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'selectedInventoryTypeAttributeList' );"/>
         </td>           
         <td>
-            <select id="selectedList" name="selectedList" multiple="multiple" style="height: 200px; width: 100%; margin-top: 45px;" ondblclick="moveSelectedById( 'selectedList', 'availableList' )"></select>
+            <select id="selectedInventoryTypeAttributeList" name="selectedInventoryTypeAttributeList" multiple="multiple" style="height: 200px; width: 100%; margin-top: 45px;" ondblclick="moveSelectedById( 'selectedInventoryTypeAttributeList', 'availableInventoryTypeAttributeList' )"></select>
         </td>
       </tr>
 	  

=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeList.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeList.vm	2012-04-26 10:00:48 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeList.vm	2012-05-01 06:15:42 +0000
@@ -58,7 +58,7 @@
                 <p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
                 <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
                 <p><label class="bold">$i18n.getString( "tracking" ):</label><br><span id="trackingField"></span></p>
-                <p><label class="bold">$i18n.getString( "catalog_type" ):</label><br><span id="catalogTypeField"></span></p>
+                <p><label class="bold">$i18n.getString( "catalogType" ):</label><br><span id="catalogTypeField"></span></p>
             </div>
 
         </td>

=== added file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/addInventoryTypeForm.js'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/addInventoryTypeForm.js	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/addInventoryTypeForm.js	2012-05-01 06:15:42 +0000
@@ -0,0 +1,13 @@
+
+jQuery(document).ready(function() {
+	validation2('addInventoryTypeForm', function(form) {
+		form.submit();
+	}, {
+		'beforeValidateHandler' : function() {
+            $("#selectedInventoryTypeAttributeList").find("option").attr("selected", "selected");
+		},
+	});
+
+	checkValueIsExist("name", "validateInventoryType.action");
+});
+

=== added file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonInventoryTypeAttributes.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonInventoryTypeAttributes.vm	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonInventoryTypeAttributes.vm	2012-05-01 06:15:42 +0000
@@ -0,0 +1,12 @@
+#set( $size = $inventoryTypeAttributes.size() )
+{ "inventoryTypeAttributes": [
+#foreach( $inventoryTypeAttribute in $inventoryTypeAttributes )
+{
+      "id": ${inventoryTypeAttribute.id},
+      "name": "$!encoder.jsonEncode( ${inventoryTypeAttribute.name} )",
+      "description": "$!encoder.jsonEncode( ${inventoryTypeAttribute.description} )",
+      "valueType": "$!encoder.jsonEncode( ${inventoryTypeAttribute.valueType} )"
+}#if( $velocityCount < $size ),#end
+#end
+]
+}
\ No newline at end of file

=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeAttibuteForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeAttibuteForm.vm	2012-04-21 12:57:24 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeAttibuteForm.vm	2012-05-01 06:15:42 +0000
@@ -52,6 +52,7 @@
                 <option value="YES/NO" #if( $inventoryTypeAttribute.valueType == 'YES/NO' ) selected="selected" #end>$i18n.getString( "yes_no" )</option>
                 <option value="DATE" #if( $inventoryTypeAttribute.valueType == 'DATE' ) selected="selected" #end>$i18n.getString( "date" )</option>
                 <option value="COMBO" #if( $inventoryTypeAttribute.valueType == 'COMBO' ) selected="selected" #end>$i18n.getString( "attribute_combo_type" )</option>
+                <option value="CATALOG" #if( $inventoryTypeAttribute.valueType == 'CATALOG' ) selected="selected" #end>$i18n.getString( "catalog" )</option>
             </select>
         </td>
     </tr>

=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeForm.vm	2012-04-26 10:00:48 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeForm.vm	2012-05-01 06:15:42 +0000
@@ -52,12 +52,13 @@
     </tr>
             
     <tr>
-        <td><label for="valueType">$i18n.getString( "catalog_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+        <td><label for="catalogType">$i18n.getString( "catalogType" ) </label></td>
         <td>
             <select id="catalogType" name="catalogType">
-				#foreach( $catalogType in $catalogTypes )
-					<option value="$catalogType.id" #if( $inventoryType.catalogType.id ) selected="selected" #end>$catalogType.name</option>
-				#end
+            	<option value="">[$i18n.getString( "please_select_catalog_type" )]</option>
+					#foreach( $catalogType in $catalogTypes )
+						<option value="$catalogType.id" #if( $inventoryType.catalogType.id ) selected="selected" #end>$catalogType.name</option>
+					#end
             </select>
         </td>
         <td></td>
@@ -74,9 +75,9 @@
     <col style="width: 450px"/>
     <thead>
       <tr>
-        <th>$i18n.getString( "available_attributes" )</th>
+        <th>$i18n.getString( "available_inventorytype_attributes" )</th>
         <th>$i18n.getString( "filter" )</th>
-        <th>$i18n.getString( "selected_attributes" )</th>
+        <th>$i18n.getString( "selected_inventorytype_attributes" )</th>
       </tr>
     </thead>
     <tbody>