svn commit: r638002 - in /ofbiz/trunk/applications: accounting/entitydef/ product/entitydef/ workeffort/entitydef/

[jacopoc]

Author: jacopoc
Date: Mon Mar 17 11:19:51 2008
New Revision: 638002

URL: http://svn.apache.org/viewvc?rev=638002&view=rev
Log:
Moved two CostComponent related entities to the right components.

Modified:
    ofbiz/trunk/applications/accounting/entitydef/entitygroup.xml
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/entitydef/entitygroup.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/accounting/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitygroup.xml?rev=638002&r1=638001&r2=638002&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitygroup.xml Mon Mar 17 11:19:51 2008
@@ -146,8 +146,6 @@
     <entity-group group="org.ofbiz" entity="ProductAverageCost" />
     <entity-group group="org.ofbiz" entity="SettlementTerm" />
     <entity-group group="org.ofbiz" entity="VarianceReasonGlAccount" />
-    <entity-group group="org.ofbiz" entity="CostComponentCalc" />
-    <entity-group group="org.ofbiz" entity="WorkEffortCostCalc" />
 
     <!-- ========================================================= -->
     <!-- org.ofbiz.accounting.payment -->

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=638002&r1=638001&r2=638002&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Mon Mar 17 11:19:51 2008
@@ -2109,55 +2109,6 @@
       </relation>
     </entity>
 
-    <!-- Work Effort Costing -->
-    <entity entity-name="WorkEffortCostCalc"
-            package-name="org.ofbiz.accounting.costs"
-            title="Work Effort Cost Calculation Entity">
-        <field name="workEffortId" type="id-ne"></field>
-        <field name="costComponentTypeId" type="id-ne"></field>
-        <field name="costComponentCalcId" type="id-ne"></field>
-        <field name="fromDate" type="date-time"></field>
-        <field name="thruDate" type="date-time"></field>
-        <prim-key field="workEffortId"/>
-        <prim-key field="costComponentTypeId"/>
-        <prim-key field="fromDate"/>
-        <relation type="one" fk-name="WK_EFFRT_COS_WEF" rel-entity-name="WorkEffort">
-            <key-map field-name="workEffortId"/>
-        </relation>
-        <relation type="one" fk-name="WK_EFFRT_COS_CCT" rel-entity-name="CostComponentType">
-            <key-map field-name="costComponentTypeId"/>
-        </relation>
-        <relation type="one" fk-name="WK_EFFRT_COS_CCC" rel-entity-name="CostComponentCalc">
-            <key-map field-name="costComponentCalcId"/>
-        </relation>
-    </entity>
-    <entity entity-name="CostComponentCalc"
-            package-name="org.ofbiz.accounting.costs"
-            title="Cost Component Calculation Entity">
-        <field name="costComponentCalcId" type="id-ne"></field>
-        <field name="description" type="description"></field>
-        <field name="costGlAccountTypeId" type="id"></field>
-        <field name="offsettingGlAccountTypeId" type="id"></field>
-        <field name="fixedCost" type="currency-amount"></field>
-        <field name="variableCost" type="currency-amount"></field>
-        <field name="perMilliSecond" type="numeric"></field>
-        <field name="currencyUomId" type="id"></field>
-        <field name="costCustomMethodId" type="id"></field>
-        <prim-key field="costComponentCalcId"/>
-        <relation type="one" fk-name="COST_COM_CGLAT" title="Cost" rel-entity-name="GlAccountType">
-            <key-map field-name="costGlAccountTypeId" rel-field-name="glAccountTypeId"/>
-        </relation>
-        <relation type="one" fk-name="COST_COM_OGLAT" title="Offsetting" rel-entity-name="GlAccountType">
-            <key-map field-name="offsettingGlAccountTypeId" rel-field-name="glAccountTypeId"/>
-        </relation>
-        <relation type="one" fk-name="COST_COM_CUOM" rel-entity-name="Uom">
-            <key-map field-name="currencyUomId" rel-field-name="uomId"/>
-        </relation>
-        <relation type="one" fk-name="COST_COM_CMET" rel-entity-name="CustomMethod">
-            <key-map field-name="costCustomMethodId" rel-field-name="customMethodId"/>
-        </relation>
-    </entity>
-
   <!-- ========================================================= -->
   <!-- org.ofbiz.accounting.payment -->
   <!-- ========================================================= -->

Modified: ofbiz/trunk/applications/product/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitygroup.xml?rev=638002&r1=638001&r2=638002&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitygroup.xml Mon Mar 17 11:19:51 2008
@@ -75,6 +75,7 @@
     <entity-group group="org.ofbiz" entity="CostComponentAttribute" />
     <entity-group group="org.ofbiz" entity="CostComponentType" />
     <entity-group group="org.ofbiz" entity="CostComponentTypeAttr" />
+    <entity-group group="org.ofbiz" entity="CostComponentCalc" />
 
     <!-- ========================================================= -->
     <!-- org.ofbiz.product.facility -->

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=638002&r1=638001&r2=638002&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Mon Mar 17 11:19:51 2008
@@ -826,6 +826,32 @@
         <key-map field-name="costComponentTypeId"/>
       </relation>
     </entity>
+    <entity entity-name="CostComponentCalc"
+            package-name="org.ofbiz.product.cost"
+            title="Cost Component Calculation Entity">
+        <field name="costComponentCalcId" type="id-ne"></field>
+        <field name="description" type="description"></field>
+        <field name="costGlAccountTypeId" type="id"></field>
+        <field name="offsettingGlAccountTypeId" type="id"></field>
+        <field name="fixedCost" type="currency-amount"></field>
+        <field name="variableCost" type="currency-amount"></field>
+        <field name="perMilliSecond" type="numeric"></field>
+        <field name="currencyUomId" type="id"></field>
+        <field name="costCustomMethodId" type="id"></field>
+        <prim-key field="costComponentCalcId"/>
+        <relation type="one" fk-name="COST_COM_CGLAT" title="Cost" rel-entity-name="GlAccountType">
+            <key-map field-name="costGlAccountTypeId" rel-field-name="glAccountTypeId"/>
+        </relation>
+        <relation type="one" fk-name="COST_COM_OGLAT" title="Offsetting" rel-entity-name="GlAccountType">
+            <key-map field-name="offsettingGlAccountTypeId" rel-field-name="glAccountTypeId"/>
+        </relation>
+        <relation type="one" fk-name="COST_COM_CUOM" rel-entity-name="Uom">
+            <key-map field-name="currencyUomId" rel-field-name="uomId"/>
+        </relation>
+        <relation type="one" fk-name="COST_COM_CMET" rel-entity-name="CustomMethod">
+            <key-map field-name="costCustomMethodId" rel-field-name="customMethodId"/>
+        </relation>
+    </entity>
 
     <!-- ========================================================= -->
     <!-- org.ofbiz.product.facility -->

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml?rev=638002&r1=638001&r2=638002&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml Mon Mar 17 11:19:51 2008
@@ -63,6 +63,7 @@
     <entity-group group="org.ofbiz" entity="WorkEffortGoodStandardType" />
     <entity-group group="org.ofbiz" entity="WorkEffortInventoryAssign" />
     <entity-group group="org.ofbiz" entity="WorkEffortInventoryProduced" />
+    <entity-group group="org.ofbiz" entity="WorkEffortCostCalc" />
     <entity-group group="org.ofbiz" entity="WorkEffortKeyword" />
     <entity-group group="org.ofbiz" entity="WorkEffortNote" />
     <entity-group group="org.ofbiz" entity="WorkEffortNoteAndData" />

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=638002&r1=638001&r2=638002&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Mon Mar 17 11:19:51 2008
@@ -639,6 +639,29 @@
         <key-map field-name="inventoryItemId"/>
       </relation>
     </entity>
+    <!-- Work Effort Costing -->
+    <entity entity-name="WorkEffortCostCalc"
+            package-name="org.ofbiz.workeffort.workeffort"
+            title="Work Effort Cost Calculation Entity">
+        <field name="workEffortId" type="id-ne"></field>
+        <field name="costComponentTypeId" type="id-ne"></field>
+        <field name="costComponentCalcId" type="id-ne"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <prim-key field="workEffortId"/>
+        <prim-key field="costComponentTypeId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="WK_EFFRT_COS_WEF" rel-entity-name="WorkEffort">
+            <key-map field-name="workEffortId"/>
+        </relation>
+        <relation type="one" fk-name="WK_EFFRT_COS_CCT" rel-entity-name="CostComponentType">
+            <key-map field-name="costComponentTypeId"/>
+        </relation>
+        <relation type="one" fk-name="WK_EFFRT_COS_CCC" rel-entity-name="CostComponentCalc">
+            <key-map field-name="costComponentCalcId"/>
+        </relation>
+    </entity>
+    
     <entity entity-name="WorkEffortKeyword" package-name="org.ofbiz.workeffort.workeffort" title="WorkEffort Keyword Entity" never-cache="true">
         <field name="workEffortId" type="id-ne"></field>
         <field name="keyword" type="short-varchar"></field>