Author: jacopoc Date: Fri Sep 22 08:00:44 2006 New Revision: 448953 URL: http://svn.apache.org/viewvc?view=rev&rev=448953 Log: The default requirement generation method set for the store should be ignored if the product is of a special type (digital good or a marketing package).
Modified: incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Modified: incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?view=diff&rev=448953&r1=448952&r2=448953 ============================================================================== --- incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Fri Sep 22 08:00:44 2006 @@ -158,10 +158,20 @@ <entity-one entity-name="Product" auto-field-map="true" value-name="product"/> <set from-field="product.requirementMethodEnumId" field="requirementMethodId"/> <if-empty field-name="requirementMethodId"> - <entity-one entity-name="ProductStore" value-name="productStore"> - <field-map env-name="order.productStoreId" field-name="productStoreId"/> - </entity-one> - <set from-field="productStore.requirementMethodEnumId" field="requirementMethodId"/> + <if> + <condition> + <and> + <if-compare field-name="product.productTypeId" operator="not-equals" value="MARKETING_PKG_AUTO"/> + <if-compare field-name="product.productTypeId" operator="not-equals" value="DIGITAL_GOOD"/> + </and> + </condition> + <then> + <entity-one entity-name="ProductStore" value-name="productStore"> + <field-map env-name="order.productStoreId" field-name="productStoreId"/> + </entity-one> + <set from-field="productStore.requirementMethodEnumId" field="requirementMethodId"/> + </then> + </if> </if-empty> </simple-method>