svn commit: r686100 - /ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml

[hansbak-2]

Author: hansbak
Date: Thu Aug 14 18:26:47 2008
New Revision: 686100

URL: http://svn.apache.org/viewvc?rev=686100&view=rev
Log:
improoved readability of code on suggestion of jacopo.

Modified:
    ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=686100&r1=686099&r2=686100&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Thu Aug 14 18:26:47 2008
@@ -85,18 +85,20 @@
         -->
         
         <!-- create also the item if key fields are provided -->
-        <if><condition><and>
-            <if-empty field="parameters.productId"/>
-            <if-empty field="parameters.reservStart"/>
-            <if-empty field="parameters.story"/>
-            <if-empty field="parameters.description"/>
-        </and></condition>
-        <then/>
-            <else>
-              <set-service-fields service-name="createCustRequestItem" map-name="parameters" to-map-name="createItem"/>
-              <set field="createItem.custRequestId" from-field="newEntity.custRequestId"/>
-              <call-service service-name="createCustRequestItem" in-map-name="createItem"/>
-            </else>
+        <if>
+            <condition>
+                <or>
+                    <not><if-empty field="parameters.productId"/></not>
+                    <not><if-empty field="parameters.reservStart"/></not>
+                    <not><if-empty field="parameters.story"/></not>
+                    <not><if-empty field="parameters.description"/></not>
+                </or>
+            </condition>
+            <then>
+                <set-service-fields service-name="createCustRequestItem" map-name="parameters" to-map-name="createItem"/>
+                <set field="createItem.custRequestId" from-field="newEntity.custRequestId"/>
+                <call-service service-name="createCustRequestItem" in-map-name="createItem"/>
+            </then>
         </if>
     </simple-method>
     <simple-method method-name="updateCustRequest" short-description="Update Customer Request">