svn commit: r442141 - in /incubator/ofbiz/trunk/applications/product: data/ProductTypeData.xml entitydef/entitymodel.xml webapp/catalog/product/ProductForms.xml

[ja...@apache.org]

Author: jacopoc
Date: Mon Sep 11 02:41:55 2006
New Revision: 442141

URL: http://svn.apache.org/viewvc?view=rev&rev=442141
Log:
Step forward in the drop shipment implementation effort:

* added new field to the SupplierProduct entity (canDropShip) to mark the product as drop shippable from the supplier
* added new seed data for two new requirements methods (for Product and ProductStore): drop-ship only and drop-ship on low qoh.


Modified:
    incubator/ofbiz/trunk/applications/product/data/ProductTypeData.xml
    incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml

Modified: incubator/ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/data/ProductTypeData.xml?view=diff&rev=442141&r1=442140&r2=442141
==============================================================================
--- incubator/ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ incubator/ofbiz/trunk/applications/product/data/ProductTypeData.xml Mon Sep 11 02:41:55 2006
@@ -387,11 +387,16 @@
     <!-- NONE: no requirement is created (default) -->
     <Enumeration description="No Requirement Created" enumCode="NONE" enumId="PRODRQM_NONE" sequenceId="01" enumTypeId="PROD_REQ_METHOD"/>
     <!-- AUTO: a requirement is created every time a sales order is entered -->
+    <!--       This is useful to implement cross-dock shipping processes -->
     <Enumeration description="Automatic For Every Sales Order" enumCode="AUTO" enumId="PRODRQM_AUTO" sequenceId="02" enumTypeId="PROD_REQ_METHOD"/>
     <!-- STOCK: a requirement is created when qoh reaches the minimum stock quantity (from ProductFacility) -->
     <Enumeration description="When QOH Reaches Minimum Stock for Product-Facility" enumCode="STOCK_QOH" enumId="PRODRQM_STOCK" sequenceId="03" enumTypeId="PROD_REQ_METHOD"/>
     <!-- ATP: a requirement is created when atp reaches the minimum stock quantity (from ProductFacility) -->
     <Enumeration description="When ATP Reaches Minimum Stock for Product-Facility" enumCode="STOCK_ATP" enumId="PRODRQM_STOCK_ATP" sequenceId="04" enumTypeId="PROD_REQ_METHOD"/>
+    <!-- PRODRQM_DS: a drop ship group is created to trigger automatic creation of a purchase order (drop shipment) every time a sales order is created-->
+    <Enumeration description="Drop-ship only" enumCode="DROPS" enumId="PRODRQM_DS" sequenceId="05" enumTypeId="PROD_REQ_METHOD"/>
+    <!-- PRODRQM_DSQOH: auto drop ship on low quantity on hand -->
+    <Enumeration description="Auto drop-ship on low quantity" enumCode="DROPS_QOH" enumId="PRODRQM_DSQOH" sequenceId="06" enumTypeId="PROD_REQ_METHOD"/>
 
     <!-- inventory item status -->
     <StatusType description="Inventory Item" hasTable="N" parentTypeId="" statusTypeId="INVENTORY_ITEM_STTS"/>

Modified: incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=442141&r1=442140&r2=442141
==============================================================================
--- incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml Mon Sep 11 02:41:55 2006
@@ -3831,6 +3831,7 @@
       <field name="currencyUomId" type="id"></field>
       <field name="supplierProductName" type="name"></field>
       <field name="supplierProductId" type="id"></field>
+      <field name="canDropShip" type="indicator"></field>
       <field name="supplierCommissionPerc" type="floating-point"></field>
       <field name="comments" type="comment"></field>
       <prim-key field="productId"/>

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?view=diff&rev=442141&r1=442140&r2=442141
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Mon Sep 11 02:41:55 2006
@@ -577,6 +577,12 @@
                 </entity-options>
             </drop-down>
         </field>
+        <field name="canDropShip">
+            <drop-down allow-empty="false" no-current-selected-key="N">
+                <option key="Y" description="${uiLabelMap.CommonY}"/>
+                <option key="N" description="${uiLabelMap.CommonN}"/>
+            </drop-down>
+        </field>
         <field use-when="supplierProduct == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field use-when="supplierProduct != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>