Author: ashish
Date: Mon Feb 8 11:09:14 2010
New Revision: 907620
URL: http://svn.apache.org/viewvc?rev=907620&view=rev
Log:
Applied patch from jira issue OFBIZ-3452 - Order main page and order list
should show product store name in the list.
Thanks Amit & Vivek 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=907620&r1=907619&r2=907620&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
Mon Feb 8 11:09:14 2010
@@ -35,9 +35,10 @@
<#if orderHeaderList?has_content>
<table class="basic-table hover-bar" cellspacing='0'>
<tr class="header-row">
- <td width="20%">${uiLabelMap.OrderOrder} #</td>
- <td width="25%">${uiLabelMap.OrderOrderBillToParty}</td>
- <td width="15%">${uiLabelMap.CommonAmount}</td>
+ <td width="10%">${uiLabelMap.OrderOrder} #</td>
+ <td width="15%">${uiLabelMap.OrderOrderBillToParty}</td>
+ <td width="25%">${uiLabelMap.OrderProductStore}</td>
+ <td width="10%">${uiLabelMap.CommonAmount}</td>
<td width="20%">${uiLabelMap.OrderTrackingCode}</td>
<td width="20%">${uiLabelMap.CommonStatus}</td>
</tr>
@@ -50,10 +51,12 @@
<#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")>
<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>
<td>${billTo?if_exists}</td>
+ <td><#if
productStore?has_content>${productStore.storeName?default(productStore.productStoreId)}</#if></td>
<td><@ofbizCurrency amount=orderHeader.grandTotal
isoCode=orderHeader.currencyUom/></td>
<td>
<#assign trackingCodes =
orderHeader.getRelated("TrackingCodeOrder")>
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=907620&r1=907619&r2=907620&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Mon Feb
8 11:09:14 2010
@@ -152,8 +152,9 @@
<td width="15%">${uiLabelMap.CommonDate}</td>
<td width="10%">${uiLabelMap.OrderOrder} #</td>
<td width="10%">${uiLabelMap.OrderOrderType}</td>
- <td width="15%">${uiLabelMap.OrderOrderBillFromParty}</td>
- <td width="15%">${uiLabelMap.OrderOrderBillToParty}</td>
+ <td width="10%">${uiLabelMap.OrderOrderBillFromParty}</td>
+ <td width="10%">${uiLabelMap.OrderOrderBillToParty}</td>
+ <td width="10%">${uiLabelMap.OrderProductStore}</td>
<td width="10%">${uiLabelMap.CommonAmount}</td>
<td width="10%">${uiLabelMap.OrderTrackingCode}</td>
<#if state.hasFilter('filterInventoryProblems') ||
state.hasFilter('filterAuthProblems') ||
state.hasFilter('filterPOsOpenPastTheirETA') ||
state.hasFilter('filterPOsWithRejectedItems') ||
state.hasFilter('filterPartiallyReceivedPOs')>
@@ -180,6 +181,7 @@
<#else>
<#assign billFrom = ''/>
</#if>
+ <#assign productStore =
orderHeader.getRelatedOneCache("ProductStore")>
<tr>
<td>${orderHeader.orderDate.toString()}</td>
<td>
@@ -188,6 +190,7 @@
<td>${orderHeader.getRelatedOneCache("OrderType").get("description",locale)}</td>
<td>${billFrom?if_exists}</td>
<td>${billTo?if_exists}</td>
+ <td><#if
productStore?has_content>${productStore.storeName?default(productStore.productStoreId)}</#if></td>
<td><@ofbizCurrency amount=orderHeader.grandTotal
isoCode=orderHeader.currencyUom/></td>
<td>
<#assign trackingCodes =
orderHeader.getRelated("TrackingCodeOrder")>
