svn commit: r675929 - in /ofbiz/trunk/applications/product: data/ProductTypeData.xml script/org/ofbiz/product/inventory/InventoryReserveServices.xml

[bibryam]

Author: bibryam
Date: Fri Jul 11 05:19:07 2008
New Revision: 675929

URL: http://svn.apache.org/viewvc?rev=675929&view=rev
Log:
Changed AGGREGATED_CONF product type to physical, needed for inventory reservations.
Another small fix in reserveForInventoryItemInline method.

Modified:
    ofbiz/trunk/applications/product/data/ProductTypeData.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml

Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=675929&r1=675928&r2=675929&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Fri Jul 11 05:19:07 2008
@@ -430,7 +430,7 @@
     <ProductType description="Marketing Package: Auto Manufactured" isPhysical="Y" isDigital="N" hasTable="N" parentTypeId="GOOD" productTypeId="MARKETING_PKG_AUTO"/>
     <ProductType description="Marketing Package: Pick Assembly" isPhysical="Y" isDigital="N" hasTable="N" parentTypeId="GOOD" productTypeId="MARKETING_PKG_PICK"/>
     <ProductType description="Work In Process" isPhysical="Y" isDigital="N" hasTable="N" parentTypeId="GOOD" productTypeId="WIP"/>
-    <ProductType description="Configurable Good Configuration" isPhysical="N" isDigital="N" hasTable="N" parentTypeId="AGGREGATED" productTypeId="AGGREGATED_CONF"/>
+    <ProductType description="Configurable Good Configuration" isPhysical="Y" isDigital="N" hasTable="N" parentTypeId="AGGREGATED" productTypeId="AGGREGATED_CONF"/>
 
     <EnumerationType description="Product Requirement Method" enumTypeId="PROD_REQ_METHOD" hasTable="N" parentTypeId=""/>
     <!-- NONE: no requirement is created (default) -->

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=675929&r1=675928&r2=675929&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Fri Jul 11 05:19:07 2008
@@ -465,10 +465,10 @@
                             </calcop>
                         </calculate>
                     </then>
-                    <!-- keep track of the last non-serialized inventory item for use if inventory is not required for purchase -->
-                    <!-- use env variable named lastNonSerInventoryItem -->
-                    <set from-field="inventoryItem" field="lastNonSerInventoryItem"/>
-                </if>
+                </if>                    
+                <!-- keep track of the last non-serialized inventory item for use if inventory is not required for purchase -->
+                <!-- use env variable named lastNonSerInventoryItem -->
+                <set from-field="inventoryItem" field="lastNonSerInventoryItem"/>
             </if-compare>
         </if-compare>
     </simple-method>