You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2010/02/22 13:16:45 UTC
svn commit: r912545 - in
/ofbiz/trunk/applications/order/webapp/ordermgr/order: OrderListByDate.ftl
orderlist.ftl
Author: ashish
Date: Mon Feb 22 12:16:45 2010
New Revision: 912545
URL: http://svn.apache.org/viewvc?rev=912545&view=rev
Log:
Applied patch from jira issue - OFBIZ-3489 - Error in orderList Screen and order main screen in case we select type purchase order on orderList Screen.
Thanks Rohit for the contribution.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl?rev=912545&r1=912544&r2=912545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl Mon Feb 22 12:16:45 2010
@@ -51,7 +51,7 @@
<#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
<#assign billTo = billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/>
</#if>
- <#assign productStore = orderHeader.getRelatedOneCache("ProductStore")>
+ <#assign productStore = orderHeader.getRelatedOneCache("ProductStore")?if_exists />
<tr<#if alt_row> class="alternate-row"</#if>>
<#assign alt_row = !alt_row>
<td><a href="/ordermgr/control/orderview?orderId=${orderHeader.orderId}" class="buttontext">${orderHeader.orderId}</a></td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=912545&r1=912544&r2=912545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Mon Feb 22 12:16:45 2010
@@ -181,7 +181,7 @@
<#else>
<#assign billFrom = ''/>
</#if>
- <#assign productStore = orderHeader.getRelatedOneCache("ProductStore")>
+ <#assign productStore = orderHeader.getRelatedOneCache("ProductStore")?if_exists />
<tr>
<td>${orderHeader.orderDate.toString()}</td>
<td>