Author: deepak
Date: Sat Apr 11 12:54:58 2015
New Revision: 1672875
URL: http://svn.apache.org/r1672875
Log:
Applied fix from trunk r#1672873
============================================================
OFBIZ-6057: Fixed freemarker stack trace on view quote item info, instead of
assigning null in freemarker corrected the condition and removed the null value
assignment.
Modified:
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Modified:
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=1672875&r1=1672874&r2=1672875&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
(original)
+++
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Sat Apr 11 12:54:58 2015
@@ -50,11 +50,6 @@ under the License.
<#assign totalQuoteAmount = 0.0>
<#assign alt_row = false/>
<#list quoteItems as quoteItem>
- <#if quoteItem.productId?exists>
- <#assign product = quoteItem.getRelatedOne("Product",
false)>
- <#else>
- <#assign product = null> <#-- don't drag it along to the
next iteration -->
- </#if>
<#assign selectedAmount = quoteItem.selectedAmount?default(1)>
<#if selectedAmount == 0>
<#assign selectedAmount = 1/>
@@ -81,7 +76,10 @@ under the License.
</td>
<td valign="top">
<div>
+ <#if quoteItem.productId?exists>
+ <#assign product =
quoteItem.getRelatedOne("Product", false)>
${(product.internalName)?if_exists}
+ </#if>
<#if showQuoteManagementLinks?exists>
<a
href="/catalog/control/EditProduct?productId=${quoteItem.productId?if_exists}"
class="buttontext">
<#if quoteItem.productId?exists>
