=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java	2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java	2012-04-17 10:58:04 +0000
@@ -1,9 +1,9 @@
 package org.hisp.dhis.coldchain.inventory;
 
 import java.io.Serializable;
+import java.util.Set;
 
 import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.program.ProgramStageInstance;
 
 public class EquipmentInstance implements Serializable
 {
@@ -16,6 +16,8 @@
     
     private boolean working = true;
     
+    private Set<EquipmentWorkingStatus> equipmentStatusUpdates;
+    
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------
@@ -114,5 +116,15 @@
     {
         this.working = working;
     }
+
+    public Set<EquipmentWorkingStatus> getEquipmentStatusUpdates()
+    {
+        return equipmentStatusUpdates;
+    }
+
+    public void setEquipmentStatusUpdates( Set<EquipmentWorkingStatus> equipmentStatusUpdates )
+    {
+        this.equipmentStatusUpdates = equipmentStatusUpdates;
+    }
     
 }

=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatus.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatus.java	2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatus.java	2012-04-17 10:58:04 +0000
@@ -5,7 +5,8 @@
 
 public class EquipmentWorkingStatus implements Serializable
 {
-
+    private int id;
+    
     private EquipmentInstance equipmentInstance;
     
     private Date reportingDate;
@@ -74,6 +75,15 @@
     // -------------------------------------------------------------------------
     // Getters and setters
     // -------------------------------------------------------------------------
+    public int getId()
+    {
+        return id;
+    }
+
+    public void setId( int id )
+    {
+        this.id = id;
+    }
 
     public EquipmentInstance getEquipmentInstance()
     {

=== added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentDetails.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentDetails.hbm.xml	1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentDetails.hbm.xml	2012-04-17 10:58:04 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+  <class name="org.hisp.dhis.coldchain.inventory.EquipmentDetails" table="equipmentdetails">
+
+    <composite-id>
+      <key-many-to-one name="equipmentInstance" class="org.hisp.dhis.coldchain.inventory.EquipmentInstance" column="equipmentinstanceid"
+        foreign-key="fk_equipmentdetails_equipmentmentinstanceid" />
+      <key-many-to-one name="inventoryTypeAttribute" class="org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute" column="inventorytypeattributeid"
+        foreign-key="fk_equipmentdetails_inventorytypeattributeid" />
+    </composite-id>
+
+    <property name="value" />
+
+    <many-to-one name="inventoryTypeAttributeOption" class="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeOption" column="inventorytypeattributeoptionid"
+      foreign-key="fk_equipmentdetails_inventorytypeattributeoptionid" />
+
+  </class>
+</hibernate-mapping>

=== added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentInstance.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentInstance.hbm.xml	1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentInstance.hbm.xml	2012-04-17 10:58:04 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+  <class name="org.hisp.dhis.coldchain.inventory.EquipmentInstance" table="equipmentinstance">
+
+    <id name="id" column="equipmentinstanceid">
+      <generator class="native" />
+    </id>
+
+    <many-to-one name="inventoryType" class="org.hisp.dhis.coldchain.inventory.InventoryType" column="inventorytypeid"
+      not-null="true" foreign-key="fk_equipmentinstance_inventorytypeid" />
+
+    <many-to-one name="organisationUnit" class="org.hisp.dhis.organisationunit.OrganisationUnit"
+        column="organisationunitid" foreign-key="fk_equipmentinstance_organisationunitid" />
+
+    <property name="working" not-null="true" />
+    
+	<set name="equipmentStatusUpdates" cascade="all-delete-orphan" inverse="true" >
+      <key column="equipmentinstanceid" />
+	  <one-to-many class="org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatus" />
+    </set>
+	
+  </class>
+</hibernate-mapping>

=== added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentWorkingStatus.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentWorkingStatus.hbm.xml	1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentWorkingStatus.hbm.xml	2012-04-17 10:58:04 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+	<class name="org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatus" table="equipmentstatusupdates">
+	
+		<id name="id" column="equipmentworkingstatusid">
+			<generator class="native" />
+		</id>
+		
+		<property name="reportingDate" column="reportingdate" />
+		 
+		<property name="updationDate" column="updationdate" />
+		 
+		<property name="status" column="status" />
+		 
+		<property name="description" column="description" />
+		 
+		<property name="storedBy" column="storedby" />
+		 
+		<many-to-one name="equipmentInstance" class="org.hisp.dhis.coldchain.inventory.EquipmentInstance" column="equipmentinstanceid"
+			foreign-key="fk_equipmentworkingstatus_equipmentInstanceid" />
+	
+	</class>
+</hibernate-mapping>
\ No newline at end of file

=== added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml	1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml	2012-04-17 10:58:04 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+  <class name="org.hisp.dhis.coldchain.inventory.InventoryType" table="inventorytype">
+    <id name="id" column="inventorytypeid">
+      <generator class="native"/>
+    </id>
+
+    <property name="name" not-null="true" unique="true" length="160"/>
+    
+    <property name="description" not-null="false" length="250"/>
+	
+	<many-to-one name="catalogType" class="org.hisp.dhis.coldchain.catalog.CatalogType" column="catalogtypeid"
+      foreign-key="fk_inventorytype_catalogypeid" />
+
+    <property name="tracking" column="tracking" />
+	
+	<set name="inventoryTypeAttributes" table="inventorytype_attributes">
+      <key column="inventorytypeid" foreign-key="fk_inventorytype_attributes_inventorytypeid" />
+      <many-to-many class="org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute" column="inventorytypeattributeid"
+          foreign-key="fk_inventorytype_attributes_inventorytypeattribtueid" />
+    </set>
+	
+
+  </class>
+</hibernate-mapping>

=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttribute.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttribute.hbm.xml	2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttribute.hbm.xml	2012-04-17 10:58:04 +0000
@@ -4,8 +4,8 @@
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
-  <class name="org.hisp.dhis.coldchain.catalog.CatalogTypeAttribute" table="catalogtypeattribute">
-    <id name="id" column="catalogtypeattributeid">
+  <class name="org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute" table="inventorytypeattribute">
+    <id name="id" column="inventorytypeattributeid">
       <generator class="native"/>
     </id>
 
@@ -20,8 +20,8 @@
     <property name="noChars" />
 	
 	<set name="attributeOptions">
-      <key column="catalogtypeattributeid" />
-      <one-to-many class="org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeOption" />
+      <key column="inventorytypeattributeid" />
+      <one-to-many class="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeOption" />
     </set>
 	
   </class>