[OFBiz] SVN: r6114 - in trunk/applications/order: config webapp/ordermgr/order

[sichen at svn.ofbiz.org]

Author: sichen
Date: 2005-11-11 21:13:57 -0600 (Fri, 11 Nov 2005)
New Revision: 6114

Modified:
   trunk/applications/order/config/OrderUiLabels.properties
   trunk/applications/order/webapp/ordermgr/order/orderheader.ftl
Log:
Removed duplicate for view/edit delivery schedule info OFBIZ-577

Modified: trunk/applications/order/config/OrderUiLabels.properties
===================================================================
--- trunk/applications/order/config/OrderUiLabels.properties	2005-11-12 02:57:50 UTC (rev 6113)
+++ trunk/applications/order/config/OrderUiLabels.properties	2005-11-12 03:13:57 UTC (rev 6114)
@@ -296,7 +296,6 @@
 OrderUpdateItems = Update Items
 OrderUseDefaultComment = Use as default comment for next entry
 OrderUseDefaultDesiredDeliveryDate = Use as default desired delivery date for next entry
-OrderViewEditDelivery = View/Delivery Schedule Info
 OrderViewEditDeliveryScheduleInfo = View/Edit Delivery Schedule Info
 OrderViewImage = View Image
 OrderViewOrder = View Order

Modified: trunk/applications/order/webapp/ordermgr/order/orderheader.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/order/orderheader.ftl	2005-11-12 02:57:50 UTC (rev 6113)
+++ trunk/applications/order/webapp/ordermgr/order/orderheader.ftl	2005-11-12 03:13:57 UTC (rev 6114)
@@ -817,8 +817,7 @@
                    <td align="left" valign="top" width="80%">
                      <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
                        <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED">
-                         <div class="tabletext"><a href="<@ofbizUrl>OrderDeliveryScheduleInfo?orderId=${orderId}</@ofbizUrl>" class="buttontext">View/Edit Delivery Schedule Info</a></div>
-                         <div class="tabletext"><a href="<@ofbizUrl>OrderDeliveryScheduleInfo?orderId=${orderId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewEditDelivery}</a></div>
+                         <div class="tabletext"><a href="<@ofbizUrl>OrderDeliveryScheduleInfo?orderId=${orderId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewEditDeliveryScheduleInfo}</a></div>
                        </#if>
                        <#if security.hasEntityPermission("ORDERMGR", "_RETURN", session) && orderHeader.statusId == "ORDER_COMPLETED">
                          <div><a href="<@ofbizUrl>quickRefundOrder?order_id=${orderId}&orderId=${orderId}&receiveReturn=true</@ofbizUrl>" class="buttontext">Quick-Refund Entire Order</a></div>