svn commit: r1033953 - /ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml

[ashish-18]

Author: ashish
Date: Thu Nov 11 14:44:12 2010
New Revision: 1033953

URL: http://svn.apache.org/viewvc?rev=1033953&view=rev
Log:
Fixing NPE. Thanks Pranay!

Modified:
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=1033953&r1=1033952&r2=1033953&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Thu Nov 11 14:44:12 2010
@@ -418,12 +418,16 @@ under the License.
                 <set field="getAssoc.productIdTo" from-field="product.productId"/>
                 <set field="getAssoc.productAssocTypeId" value="PRODUCT_VARIANT"/>
                 <find-by-and entity-name="ProductAssoc" map="getAssoc" list="assocs"/>
-                <filter-list-by-date list="assocs" to-list="assocsDate"/>
-                <first-from-list entry="assoc" list="assocsDate"/>
-                <get-related-one value-field="assoc" relation-name="MainProduct" to-value-field="virtProduct"/>
-                <if-empty field="product.salesDiscWhenNotAvail">
-                    <set field="product.salesDiscWhenNotAvail" from-field="virtProduct.salesDiscWhenNotAvail"/>
-                </if-empty>
+                <if-not-empty field="assocs">
+                    <filter-list-by-date list="assocs" to-list="assocsDate"/>
+                    <first-from-list entry="assoc" list="assocsDate"/>
+                    <if-not-empty field="assoc">
+                        <get-related-one value-field="assoc" relation-name="MainProduct" to-value-field="virtProduct"/>
+                        <if-empty field="product.salesDiscWhenNotAvail">
+                            <set field="product.salesDiscWhenNotAvail" from-field="virtProduct.salesDiscWhenNotAvail"/>
+                        </if-empty>
+                    </if-not-empty>
+                </if-not-empty>    
             </if-compare>
         </if-not-empty>