svn commit: r1296602 - /ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy

Author: jleroux
Date: Sat Mar  3 11:11:49 2012
New Revision: 1296602

URL: http://svn.apache.org/viewvc?rev=1296602&view=rev
Log:
Reverts r1296600 which was useless and wrong

Modified:
    ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy?rev=1296602&r1=1296601&r2=1296602&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy Sat Mar  3 11:11:49 2012
@@ -53,18 +53,7 @@ if (productId) {
 // get the product entity
 if (productId) {
     product = delegator.findByPrimaryKeyCache("Product", [productId : productId]);
-    if (product) {
-        // first make sure this isn't a virtual-variant that has an associated virtual product, if it does show that instead of the variant
-        if("Y".equals(product.isVirtual) && "Y".equals(product.isVariant)){
-            virtualVariantProductAssocs = delegator.findByAndCache("ProductAssoc", ["productId": productId, "productAssocTypeId": "ALTERNATIVE_PACKAGE"], ["-fromDate"]);
-            virtualVariantProductAssocs = EntityUtil.filterByDate(virtualVariantProductAssocs);
-            if (virtualVariantProductAssocs) {
-                productAssoc = EntityUtil.getFirst(virtualVariantProductAssocs);
-                product = productAssoc.getRelatedOneCache("AssocProduct");
-            }
-        }
-    }
-    
+
     // first make sure this isn't a variant that has an associated virtual product, if it does show that instead of the variant
     virtualProductId = ProductWorker.getVariantVirtualId(product);
     if (virtualProductId) {