svn commit: r899365 - in /ofbiz/trunk: applications/workeffort/entitydef/entitymodel.xml framework/common/entitydef/entitymodel.xml

[jaz-3]

Author: jaz
Date: Thu Jan 14 19:24:32 2010
New Revision: 899365

URL: http://svn.apache.org/viewvc?rev=899365&view=rev
Log:
added UomGroup entity; fixed bad relationship ID on workeffort purpose type

Modified:
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
    ofbiz/trunk/framework/common/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=899365&r1=899364&r2=899365&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Thu Jan 14 19:24:32 2010
@@ -738,7 +738,7 @@
       <field name="description" type="description"></field>
       <prim-key field="workEffortPurposeTypeId"/>
       <relation type="one" fk-name="WK_EFFRT_PTYPE_PAR" title="Parent" rel-entity-name="WorkEffortPurposeType">
-        <key-map field-name="parentTypeId" rel-field-name="WorkEffortPurposeType"/>
+        <key-map field-name="parentTypeId" rel-field-name="workEffortPurposeTypeId"/>
       </relation>
     </entity>
     <entity entity-name="WorkEffortReview" package-name="org.ofbiz.workeffort.workeffort" title="WorkEffort Review Entity">

Modified: ofbiz/trunk/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/entitydef/entitymodel.xml?rev=899365&r1=899364&r2=899365&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/framework/common/entitydef/entitymodel.xml Thu Jan 14 19:24:32 2010
@@ -453,6 +453,22 @@
         <key-map field-name="uomTypeId"/>
       </relation>
     </entity>
+    <view-entity entity-name="UomAndGroup"
+            package-name="org.ofbiz.common.uom"
+            title="Unit Of Measure and Group/Type View Entity">
+        <member-entity entity-alias="UOMGP" entity-name="UomGroup"/>
+        <member-entity entity-alias="UOM" entity-name="Uom"/>        
+        <member-entity entity-alias="UOMTP" entity-name="UomType"/>
+        <alias-all entity-alias="UOMGP"/>
+        <alias-all entity-alias="UOM"/>        
+        <alias-all entity-alias="UOMTP" prefix="type"/>                      
+        <view-link entity-alias="UOMGP" rel-entity-alias="UOM">
+            <key-map field-name="uomId"/>
+        </view-link>
+        <view-link entity-alias="UOM" rel-entity-alias="UOMTP">
+            <key-map field-name="uomTypeId"/>
+        </view-link>
+    </view-entity>
     <view-entity entity-name="UomAndType"
             package-name="org.ofbiz.common.uom"
             title="Unit Of Measure and Type View Entity">
@@ -512,7 +528,19 @@
       <relation type="one" fk-name="UOMD_PURPOSE_ENUM" title="Purpose" rel-entity-name="Enumeration">
         <key-map field-name="purposeEnumId" rel-field-name="enumId"/>
       </relation>
-    </entity>
+    </entity>    
+    <entity entity-name="UomGroup"
+            package-name="org.ofbiz.common.uom"
+            default-resource-name="CommonEntityLabels"
+            title="Unit Of Measure Group Entity">
+      <field name="uomGroupId" type="id-ne"></field>
+      <field name="uomId" type="id-ne"></field>
+      <prim-key field="uomGroupId"/>
+      <prim-key field="uomId"/>
+      <relation type="one" fk-name="UOM_GROUP_UOM" rel-entity-name="Uom">
+        <key-map field-name="uomId"/>
+      </relation>
+    </entity>    
     <entity entity-name="UomType"
             package-name="org.ofbiz.common.uom"
             default-resource-name="CommonEntityLabels"