svn commit: r630429 - in /ofbiz/trunk/applications/product/entitydef: entitygroup.xml entitymodel.xml

[jonesde]

Author: jonesde
Date: Sat Feb 23 05:12:03 2008
New Revision: 630429

URL: http://svn.apache.org/viewvc?rev=630429&view=rev
Log:
Moded ProductCategoryGlAccount entity to a better package for it

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

Modified: ofbiz/trunk/applications/product/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitygroup.xml?rev=630429&r1=630428&r2=630429&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitygroup.xml Sat Feb 23 05:12:03 2008
@@ -42,6 +42,7 @@
     <entity-group group="org.ofbiz" entity="ProductCategoryContent" />
     <entity-group group="org.ofbiz" entity="ProductCategoryContentAndInfo" />
     <entity-group group="org.ofbiz" entity="ProductCategoryContentType" />
+    <entity-group group="org.ofbiz" entity="ProductCategoryGlAccount" />    
     <entity-group group="org.ofbiz" entity="ProductCategoryLink" />
     <entity-group group="org.ofbiz" entity="ProductCategoryMember" />
     <entity-group group="org.ofbiz" entity="ProductCategoryMemberAndRole" />
@@ -168,7 +169,6 @@
     <entity-group group="org.ofbiz" entity="ProductContentType" />
     <entity-group group="org.ofbiz" entity="ProductGeo" />
     <entity-group group="org.ofbiz" entity="ProductGlAccount" />
-    <entity-group group="org.ofbiz" entity="ProductCategoryGlAccount" />    
     <entity-group group="org.ofbiz" entity="ProductInventoryItem" />
     <entity-group group="org.ofbiz" entity="ProductKeyword" />
     <entity-group group="org.ofbiz" entity="OldProductKeywordResult" />

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=630429&r1=630428&r2=630429&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Sat Feb 23 05:12:03 2008
@@ -315,6 +315,27 @@
         <key-map field-name="parentTypeId" rel-field-name="prodCatContentTypeId"/>
       </relation>
     </entity>
+    <entity entity-name="ProductCategoryGlAccount" package-name="org.ofbiz.product.category" title="Product Category GlAccount Entity">
+        <field name="productCategoryId" type="id-ne"></field>
+        <field name="organizationPartyId" type="id-ne"></field>
+        <field name="glAccountTypeId" type="id-ne"></field>
+        <field name="glAccountId" type="id-ne"></field>
+        <prim-key field="productCategoryId"/>
+        <prim-key field="organizationPartyId"/>
+        <prim-key field="glAccountTypeId"/>
+        <relation type="one" fk-name="PRD_CT_GLACT_PCAT" rel-entity-name="ProductCategory">
+            <key-map field-name="productCategoryId"/>
+        </relation>
+        <relation type="one" fk-name="PRD_CT_GLACT_PRTY" rel-entity-name="Party">
+            <key-map field-name="organizationPartyId" rel-field-name="partyId"/>
+        </relation>
+        <relation type="one" fk-name="PRD_CT_GLACT_TYPE" rel-entity-name="GlAccountType">
+            <key-map field-name="glAccountTypeId"/>
+        </relation>
+        <relation type="one" fk-name="PRD_CT_GLACT_GLACT" rel-entity-name="GlAccount">
+            <key-map field-name="glAccountId"/>
+        </relation>
+    </entity>
     <entity entity-name="ProductCategoryLink"
         package-name="org.ofbiz.product.category"
         title="Product Category Link Entity">
@@ -2374,29 +2395,6 @@
         <key-map field-name="glAccountTypeId"/>
       </relation>
       <relation type="one" fk-name="PROD_GLACT_GLACT" rel-entity-name="GlAccount">
-        <key-map field-name="glAccountId"/>
-      </relation>
-    </entity>
-    <entity entity-name="ProductCategoryGlAccount"
-            package-name="org.ofbiz.product.product"
-            title="Product Category GlAccount Entity">
-      <field name="productCategoryId" type="id-ne"></field>
-      <field name="organizationPartyId" type="id-ne"></field>
-      <field name="glAccountTypeId" type="id-ne"></field>
-      <field name="glAccountId" type="id-ne"></field>
-      <prim-key field="productCategoryId"/>
-      <prim-key field="organizationPartyId"/>
-      <prim-key field="glAccountTypeId"/>
-      <relation type="one" fk-name="PRD_CT_GLACT_PCAT" rel-entity-name="ProductCategory">
-        <key-map field-name="productCategoryId"/>
-      </relation>
-      <relation type="one" fk-name="PRD_CT_GLACT_PRTY" rel-entity-name="Party">
-        <key-map field-name="organizationPartyId" rel-field-name="partyId"/>
-      </relation>
-      <relation type="one" fk-name="PRD_CT_GLACT_TYPE" rel-entity-name="GlAccountType">
-        <key-map field-name="glAccountTypeId"/>
-      </relation>
-      <relation type="one" fk-name="PRD_CT_GLACT_GLACT" rel-entity-name="GlAccount">
         <key-map field-name="glAccountId"/>
       </relation>
     </entity>