[OFBiz] SVN: r6107 - trunk/applications/order/script/org/ofbiz/order/quote

[jacopo at svn.ofbiz.org]

Author: jacopo
Date: 2005-11-11 03:39:50 -0600 (Fri, 11 Nov 2005)
New Revision: 6107

Modified:
   trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
Log:
Some minor changed to better handle the request to quote creation.

Modified: trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
===================================================================
--- trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml	2005-11-11 06:28:28 UTC (rev 6106)
+++ trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml	2005-11-11 09:39:50 UTC (rev 6107)
@@ -419,6 +419,7 @@
         <set from-field="custRequest.custRequestName" field="newQuote.quoteName"/>
         <set from-field="custRequest.description" field="newQuote.description"/>
         <set from-field="custRequest.maximumAmountUomId" field="newQuote.currencyUomId"/>
+        <set from-field="custRequest.productStoreId" field="newQuote.productStoreId"/>
         <set from-field="custRequestItem.story" field="newQuoteItem.comments"/>
         <create-value value-name="newQuote"/>
         <create-value value-name="newQuoteItem"/>
@@ -718,10 +719,13 @@
         <get-related value-name="custRequest" relation-name="CustRequestRole" list-name="custRequestRoles"/>
         <iterate list-name="custRequestRoles" entry-name="custRequestRole">
             <clear-field field-name="createQuoteRoleInMap"/>
-            <set field="createQuoteRoleInMap.quoteId" from-field="quoteId"/>
-            <set field="createQuoteRoleInMap.partyId" from-field="custRequestRole.partyId"/>
-            <set field="createQuoteRoleInMap.roleTypeId" from-field="custRequestRole.roleTypeId"/>
-            <call-service service-name="createQuoteRole" in-map-name="createQuoteRoleInMap"/>
+            <!-- The REQ_TAKER role is automatically added by the createQuote service -->
+            <if-compare field-name="custRequestRole.roleTypeId" value="REQ_TAKER" operator="not-equals">
+                <set field="createQuoteRoleInMap.quoteId" from-field="quoteId"/>
+                <set field="createQuoteRoleInMap.partyId" from-field="custRequestRole.partyId"/>
+                <set field="createQuoteRoleInMap.roleTypeId" from-field="custRequestRole.roleTypeId"/>
+                <call-service service-name="createQuoteRole" in-map-name="createQuoteRoleInMap"/>
+            </if-compare>
         </iterate>
         
         <field-to-result field-name="quoteId" result-name="quoteId"/>