diff --git a/applications/datamodel/data/seed/ProductSeedData.xml b/applications/datamodel/data/seed/ProductSeedData.xml
index 05d6f640343..c01071525ab 100644
--- a/applications/datamodel/data/seed/ProductSeedData.xml
+++ b/applications/datamodel/data/seed/ProductSeedData.xml
@@ -783,4 +783,12 @@ under the License.
     <CustomMethod customMethodId="SHIP_EST_USPS_INT" customMethodTypeId="SHIP_EST" customMethodName="uspsInternationalRateInquire"   description="USPS rate estimate international"/>
 
     <Enumeration description="Direct Store Delivery" enumCode="DIRECT_STORE_DELIVRY" enumId="DIRECT_STORE_DELIVRY" sequenceId="01"/>
+
+    <!-- InventoryCount Status -->
+    <StatusType description="Inventory Count Status" hasTable="N" statusTypeId="INV_COUNT_STATUS"/>
+    <StatusItem description="In Progress" sequenceId="01" statusCode="IN_PROGRESS" statusId="INV_COUNT_INPROG" statusTypeId="INV_COUNT_STATUS"/>
+    <StatusItem description="Completed" sequenceId="02" statusCode="COMPLETED" statusId="INV_COUNT_COMPLETED" statusTypeId="INV_COUNT_STATUS"/>
+    <StatusItem description="Cancelled" sequenceId="03" statusCode="CANCELLED" statusId="INV_COUNT_CANCELLED" statusTypeId="INV_COUNT_STATUS"/>
+    <StatusValidChange statusId="INV_COUNT_INPROG" statusIdTo="INV_COUNT_COMPLETED" transitionName="Complete"/>
+    <StatusValidChange statusId="INV_COUNT_INPROG" statusIdTo="INV_COUNT_CANCELLED" transitionName="Cancel"/>
 </entity-engine-xml>
diff --git a/applications/datamodel/entitydef/product-entitymodel.xml b/applications/datamodel/entitydef/product-entitymodel.xml
index 1f3d78a3422..b70c6a9e822 100644
--- a/applications/datamodel/entitydef/product-entitymodel.xml
+++ b/applications/datamodel/entitydef/product-entitymodel.xml
@@ -2475,6 +2475,108 @@ under the License.
       <field name="description" type="description"></field>
       <prim-key field="varianceReasonId"/>
     </entity>
+    <entity entity-name="InventoryCount"
+            package-name="org.apache.ofbiz.product.inventory"
+            title="Inventory Count">
+      <field name="inventoryCountId" type="id"></field>
+      <field name="countName" type="name"></field>
+      <field name="statusId" type="id"></field>
+      <field name="facilityId" type="id"></field>
+      <field name="workEffortId" type="id"></field>
+      <field name="assignedUserLoginId" type="id-vlong"></field>
+      <field name="parentInventoryCountId" type="id"></field>
+      <field name="createdDate" type="date-time"></field>
+      <field name="dueDate" type="date-time"></field>
+      <field name="approvedDate" type="date-time"></field>
+      <prim-key field="inventoryCountId"/>
+      <relation type="one" rel-entity-name="StatusItem" fk-name="INV_CNT_STTS">
+        <key-map field-name="statusId"/>
+      </relation>
+      <relation type="one" rel-entity-name="Facility" fk-name="INV_CNT_FAC">
+        <key-map field-name="facilityId"/>
+      </relation>
+      <relation type="one-nofk" rel-entity-name="UserLogin" fk-name="INV_CNT_ULGN">
+        <key-map field-name="assignedUserLoginId" rel-field-name="userLoginId"/>
+      </relation>
+      <relation type="one-nofk" rel-entity-name="WorkEffort" fk-name="INV_CNT_WEFF">
+        <key-map field-name="workEffortId"/>
+      </relation>
+      <relation type="one-nofk" rel-entity-name="InventoryCount" title="Parent" fk-name="INV_CNT_PAR">
+        <key-map field-name="parentInventoryCountId" rel-field-name="inventoryCountId"/>
+      </relation>
+    </entity>
+    <entity entity-name="InventoryCountItem"
+            package-name="org.apache.ofbiz.product.inventory"
+            title="Inventory Count Item">
+      <field name="inventoryCountId" type="id"></field>
+      <field name="countItemSeqId" type="id"></field>
+      <field name="productId" type="id"></field>
+      <field name="inventoryItemId" type="id"></field>
+      <field name="productIdentifier" type="short-varchar"></field>
+      <field name="locationSeqId" type="id"></field>
+      <field name="quantity" type="fixed-point"></field>
+      <field name="systemQuantity" type="fixed-point"></field>
+      <field name="statusId" type="id"></field>
+      <field name="isRequested" type="indicator"></field>
+      <field name="countedByUserLoginId" type="id-vlong"></field>
+      <field name="createdDate" type="date-time"></field>
+      <field name="createdByUserLoginId" type="id-vlong"></field>
+      <prim-key field="inventoryCountId"/>
+      <prim-key field="countItemSeqId"/>
+      <relation type="one" rel-entity-name="InventoryCount" fk-name="INV_CNT_ITM_HDR">
+        <key-map field-name="inventoryCountId"/>
+      </relation>
+      <relation type="one-nofk" rel-entity-name="Product" fk-name="INV_CNT_ITM_PROD">
+        <key-map field-name="productId"/>
+      </relation>
+      <relation type="one-nofk" rel-entity-name="InventoryItem" fk-name="INV_CNT_ITM_II">
+        <key-map field-name="inventoryItemId"/>
+      </relation>
+      <relation type="one" rel-entity-name="StatusItem" fk-name="INV_CNT_ITM_STTS">
+        <key-map field-name="statusId"/>
+      </relation>
+    </entity>
+    <entity entity-name="InventoryCountVariance"
+            package-name="org.apache.ofbiz.product.inventory"
+            title="Inventory Count Variance">
+      <field name="inventoryCountId" type="id"></field>
+      <field name="countItemSeqId" type="id"></field>
+      <field name="varianceSeqId" type="id"></field>
+      <field name="varianceQty" type="fixed-point"></field>
+      <field name="varianceReasonId" type="id"></field>
+      <field name="createdDate" type="date-time"></field>
+      <field name="createdByUserLoginId" type="id-vlong"></field>
+      <prim-key field="inventoryCountId"/>
+      <prim-key field="countItemSeqId"/>
+      <prim-key field="varianceSeqId"/>
+      <relation type="one" rel-entity-name="InventoryCountItem" fk-name="INV_CNT_VAR_ITM">
+        <key-map field-name="inventoryCountId"/>
+        <key-map field-name="countItemSeqId"/>
+      </relation>
+      <relation type="one" rel-entity-name="VarianceReason" fk-name="INV_CNT_VAR_RSN">
+        <key-map field-name="varianceReasonId"/>
+      </relation>
+    </entity>
+    <entity entity-name="InventoryCountStatus"
+            package-name="org.apache.ofbiz.product.inventory"
+            title="Inventory Count Status History">
+      <field name="inventoryCountId" type="id"></field>
+      <field name="statusId" type="id"></field>
+      <field name="statusDate" type="date-time"></field>
+      <field name="changeByUserLoginId" type="id-vlong"></field>
+      <prim-key field="inventoryCountId"/>
+      <prim-key field="statusId"/>
+      <prim-key field="statusDate"/>
+      <relation type="one" rel-entity-name="InventoryCount" fk-name="INV_CNT_ST_HDR">
+        <key-map field-name="inventoryCountId"/>
+      </relation>
+      <relation type="one" rel-entity-name="StatusItem" fk-name="INV_CNT_ST_STTS">
+        <key-map field-name="statusId"/>
+      </relation>
+      <relation type="one-nofk" rel-entity-name="UserLogin" fk-name="INV_CNT_ST_ULGN">
+        <key-map field-name="changeByUserLoginId" rel-field-name="userLoginId"/>
+      </relation>
+    </entity>
 
   <!-- ========================================================= -->
   <!-- org.apache.ofbiz.product.price -->
diff --git a/applications/product/servicedef/services_inventory.xml b/applications/product/servicedef/services_inventory.xml
index dec742ec0ce..043e1a4a696 100644
--- a/applications/product/servicedef/services_inventory.xml
+++ b/applications/product/servicedef/services_inventory.xml
@@ -84,4 +84,67 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
+    <service name="createInventoryCount" default-entity-name="InventoryCount" engine="entity-auto" invoke="create" auth="true">
+        <description>Create a InventoryCount</description>
+        <auto-attributes include="pk" mode="INOUT" optional="true"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateInventoryCount" default-entity-name="InventoryCount" engine="entity-auto" invoke="update" auth="true">
+        <description>Update a InventoryCount</description>
+        <auto-attributes include="pk" mode="IN"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="deleteInventoryCount" default-entity-name="InventoryCount" engine="entity-auto" invoke="delete" auth="true">
+        <description>Delete a InventoryCount</description>
+        <auto-attributes include="pk" mode="IN"/>
+    </service>
+
+    <service name="createInventoryCountItem" default-entity-name="InventoryCountItem" engine="entity-auto" invoke="create" auth="true">
+        <description>Create a InventoryCountItem</description>
+        <auto-attributes include="pk" mode="INOUT" optional="true"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <override name="inventoryCountId" optional="false"/>
+    </service>
+    <service name="updateInventoryCountItem" default-entity-name="InventoryCountItem" engine="entity-auto" invoke="update" auth="true">
+        <description>Update a InventoryCountItem</description>
+        <auto-attributes include="pk" mode="IN"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="deleteInventoryCountItem" default-entity-name="InventoryCountItem" engine="entity-auto" invoke="delete" auth="true">
+        <description>Delete a InventoryCountItem</description>
+        <auto-attributes include="pk" mode="IN"/>
+    </service>
+
+    <service name="createInventoryCountVariance" default-entity-name="InventoryCountVariance" engine="entity-auto" invoke="create" auth="true">
+        <description>Create a InventoryCountVariance</description>
+        <auto-attributes include="pk" mode="INOUT" optional="true"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <override name="inventoryCountId" optional="false"/>
+        <override name="countItemSeqId" optional="false"/>
+    </service>
+    <service name="updateInventoryCountVariance" default-entity-name="InventoryCountVariance" engine="entity-auto" invoke="update" auth="true">
+        <description>Update a InventoryCountVariance</description>
+        <auto-attributes include="pk" mode="IN"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="deleteInventoryCountVariance" default-entity-name="InventoryCountVariance" engine="entity-auto" invoke="delete" auth="true">
+        <description>Delete a InventoryCountVariance</description>
+        <auto-attributes include="pk" mode="IN"/>
+    </service>
+
+    <service name="createInventoryCountStatus" default-entity-name="InventoryCountStatus" engine="entity-auto" invoke="create" auth="true">
+        <description>Create a InventoryCountStatus</description>
+        <auto-attributes include="pk" mode="INOUT" optional="true"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateInventoryCountStatus" default-entity-name="InventoryCountStatus" engine="entity-auto" invoke="update" auth="true">
+        <description>Update a InventoryCountStatus</description>
+        <auto-attributes include="pk" mode="IN"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="deleteInventoryCountStatus" default-entity-name="InventoryCountStatus" engine="entity-auto" invoke="delete" auth="true">
+        <description>Delete a InventoryCountStatus</description>
+        <auto-attributes include="pk" mode="IN"/>
+    </service>
+
 </services>
\ No newline at end of file