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

[jonesde]

Author: jonesde
Date: Wed Oct 10 02:12:25 2007
New Revision: 583396

URL: http://svn.apache.org/viewvc?rev=583396&view=rev
Log:
Added new VendorProduct entity, like recent ones for multi-vendor stores; also a few cleanups in other entities

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=583396&r1=583395&r2=583396&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitygroup.xml Wed Oct 10 02:12:25 2007
@@ -184,7 +184,8 @@
     <entity-group group="org.ofbiz" entity="ProductVirtualAndAssocPrices" />
     <entity-group group="org.ofbiz" entity="ProductVirtualAndVariantInfo" />
     <entity-group group="org.ofbiz" entity="ProductAndPriceView" />
-
+    <entity-group group="org.ofbiz" entity="VendorProduct" />
+    
   <!-- ========================================================= -->
   <!-- org.ofbiz.product.promo -->
   <!-- ========================================================= -->

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=583396&r1=583395&r2=583396&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Wed Oct 10 02:12:25 2007
@@ -2510,7 +2510,7 @@
           <key-map field-name="productStoreId"/>
         </relation>
         <relation type="one" fk-name="PROD_REVIEW_PROD" rel-entity-name="Product">
-          <key-map field-name="productId" rel-field-name="productId"/>
+          <key-map field-name="productId"/>
         </relation>
         <relation type="one" fk-name="PROD_REVIEW_ULH" rel-entity-name="UserLogin">
           <key-map field-name="userLoginId" rel-field-name="userLoginId"/>
@@ -2685,6 +2685,24 @@
         <key-map field-name="productId"/>
       </view-link>
     </view-entity>
+    <entity entity-name="VendorProduct" package-name="org.ofbiz.product.product">
+        <description>For information related to a specific vendor and product, especially for multi-vendor stores. The ProductStoreGroup is to be used much like in ProductPrice.</description>
+        <field name="productId" type="id-ne"></field>
+        <field name="vendorPartyId" type="id-ne"></field>
+        <field name="productStoreGroupId" type="id-ne"></field>
+        <prim-key field="productId"/>
+        <prim-key field="vendorPartyId"/>
+        <prim-key field="productStoreGroupId"/>
+        <relation type="one" fk-name="VENDPROD_PROD" rel-entity-name="Product">
+            <key-map field-name="productId"/>
+        </relation>
+        <relation type="one" fk-name="VENDPROD_VPTY" title="Vendor" rel-entity-name="Party">
+            <key-map field-name="vendorPartyId" rel-field-name="partyId"/>
+        </relation>
+        <relation type="one" fk-name="VENDPROD_PSGRP" rel-entity-name="ProductStoreGroup">
+            <key-map field-name="productStoreGroupId"/>
+        </relation>
+    </entity>
 
   <!-- ========================================================= -->
   <!-- org.ofbiz.product.promo -->
@@ -3038,6 +3056,15 @@
         <key-map field-name="facilityTypeId"/>
       </relation>
     </entity>
+    <view-entity entity-name="FacilityAndContactMech" package-name="org.ofbiz.product.storage" title="Facility and Contact Mech View Entity">
+        <member-entity entity-alias="FA" entity-name="Facility"/>
+        <member-entity entity-alias="CM" entity-name="FacilityContactMech"/>
+        <alias-all entity-alias="FA"/>
+        <alias-all entity-alias="CM"/>
+        <view-link entity-alias="FA" rel-entity-alias="CM">
+            <key-map field-name="facilityId"/>
+        </view-link>
+    </view-entity>
     <entity entity-name="FacilityAttribute"
             package-name="org.ofbiz.product.storage"
             title="Facility Attribute Entity">
@@ -4310,15 +4337,4 @@
       <field name="description" type="description"></field>
       <prim-key field="supplierRatingTypeId"/>
     </entity>
-    <view-entity entity-name="FacilityAndContactMech"
-            package-name="org.ofbiz.product.storage"
-            title="Facility and Contact Mech View Entity">
-      <member-entity entity-alias="FA" entity-name="Facility"/>
-      <member-entity entity-alias="CM" entity-name="FacilityContactMech"/>
-      <alias-all entity-alias="FA"/>
-      <alias-all entity-alias="CM"/>
-      <view-link entity-alias="FA" rel-entity-alias="CM">
-          <key-map field-name="facilityId"/>
-      </view-link>
-    </view-entity>
 </entitymodel>