Author: pranayp
Date: Tue Jun 21 14:05:30 2016
New Revision: 1749519
URL: http://svn.apache.org/viewvc?rev=1749519&view=rev
Log:
[OFBIZ-7404] Applied patch from the ticket. Now now Sales Quote won't be
created for cancelled or rejected items from CustRequestItem. Than Chandan
Khandelwal for the contribution.
Modified:
ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml
Modified: ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml?rev=1749519&r1=1749518&r2=1749519&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml Tue Jun 21
14:05:30 2016
@@ -915,7 +915,13 @@ under the License.
</call-service>
<check-errors/>
- <get-related value-field="custRequest" relation-name="CustRequestItem"
list="custRequestItems"/>
+ <entity-condition list="custRequestItems"
entity-name="CustRequestItem">
+ <condition-list combine="and">
+ <condition-expr field-name="custRequestId" operator="equals"
from-field="custRequest.custRequestId"/>
+ <condition-expr field-name="statusId" operator="not-equals"
value="CRQ_CANCELLED"/>
+ <condition-expr field-name="statusId" operator="not-equals"
value="CRQ_REJECTED"/>
+ </condition-list>
+ </entity-condition>
<iterate list="custRequestItems" entry="custRequestItem">
<clear-field field="createQuoteItemInMap"/>
<set field="createQuoteItemInMap.quoteId" from-field="quoteId"/>
