svn commit: r650820 - in /ofbiz/trunk/applications/product/entitydef: entitymodel.xml entitymodel_shipment.xml

[mor-2]

Author: mor
Date: Wed Apr 23 03:36:58 2008
New Revision: 650820

URL: http://svn.apache.org/viewvc?rev=650820&view=rev
Log:
Adding attributes defaultShipmentBoxTypeId to Product entity (for choosing default box type for a product) and boxWeight, weightUomId to ShipmentBoxType entity resp. (for information about weight)

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

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=650820&r1=650819&r2=650820&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Wed Apr 23 03:36:58 2008
@@ -2434,7 +2434,8 @@
       <field name="createdByUserLogin" type="id-vlong"></field>
       <field name="lastModifiedDate" type="date-time"></field>
       <field name="lastModifiedByUserLogin" type="id-vlong"></field>
-      <field name="inShippingBox" type="indicator"></field>        
+      <field name="inShippingBox" type="indicator"></field>
+      <field name="defaultShipmentBoxTypeId" type="id"></field>        
       <prim-key field="productId"/>
       <relation type="one" fk-name="PROD_TYPE" rel-entity-name="ProductType">
         <key-map field-name="productTypeId"/>
@@ -2493,6 +2494,9 @@
       <relation type="many" rel-entity-name="SimpleSalesTaxLookup">
         <key-map field-name="taxCategory"/>
       </relation>
+      <relation type="one" fk-name="PROD_SHBX_TYPE" title="Default" rel-entity-name="ShipmentBoxType">
+          <key-map field-name="defaultShipmentBoxTypeId" rel-field-name="shipmentBoxTypeId"/>
+      </relation>  
     </entity>
     <entity entity-name="ProductAssoc"
             package-name="org.ofbiz.product.product"

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?rev=650820&r1=650819&r2=650820&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Wed Apr 23 03:36:58 2008
@@ -684,10 +684,15 @@
       <field name="boxLength" type="floating-point"></field>
       <field name="boxWidth" type="floating-point"></field>
       <field name="boxHeight" type="floating-point"></field>
+      <field name="weightUomId" type="id"></field>  
+      <field name="boxWeight" type="floating-point"></field>
       <prim-key field="shipmentBoxTypeId"/>
       <relation type="one" fk-name="SHMT_BXTP_DUOM" title="Dimension" rel-entity-name="Uom">
         <key-map field-name="dimensionUomId" rel-field-name="uomId"/>
       </relation>
+      <relation type="one" fk-name="SHMT_BXTP_WUOM" title="Weight" rel-entity-name="Uom">
+        <key-map field-name="weightUomId" rel-field-name="uomId"/>
+      </relation>        
     </entity>
     <entity entity-name="ShipmentContactMech"
             package-name="org.ofbiz.shipment.shipment"