Author: sichen
Date: Fri Feb 16 12:49:10 2007
New Revision: 508576
URL: http://svn.apache.org/viewvc?view=rev&rev=508576
Log:
Moved the create as new order button on the orderview page next to the edit
items button, instead of way down at the bottom below the order notes
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.properties
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?view=diff&rev=508576&r1=508575&r2=508576
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Fri Feb 16
12:49:10 2007
@@ -169,6 +169,7 @@
OrderCreateCustRequestFromShoppingList=Create a Request For Quote
OrderCreateNewReturn=Create new return
OrderCreateOrder=Create Order
+OrderCreateAsNewOrder=Create As New Order
OrderCreateOrderQuote=Create New Quote
OrderCreateOrderQuoteAdjustment=Create Manual Adjustment
OrderCreateOrderQuoteAttribute=Create New Quote Attribute
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?view=diff&rev=508576&r1=508575&r2=508576
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Fri Feb
16 12:49:10 2007
@@ -29,7 +29,8 @@
<#--
<a
href="<@ofbizUrl>cancelOrderItem?${paramString}</@ofbizUrl>"
class="submenutext">${uiLabelMap.OrderCancelAllItems}</a>
-->
- <a
href="<@ofbizUrl>editOrderItems?${paramString}</@ofbizUrl>"
class="submenutextright">${uiLabelMap.OrderEditItems}</a>
+ <a
href="<@ofbizUrl>editOrderItems?${paramString}</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderEditItems}</a>
+ <a
href="<@ofbizUrl>loadCartFromOrder?${paramString}&finalizeMode=init</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderCreateAsNewOrder}</a>
</#if>
<#if returnableItems?has_content>
<a
href="<@ofbizUrl>quickreturn?orderId=${orderId}&party_id=${partyId?if_exists}&returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>"
class="submenutextright">${uiLabelMap.OrderCreateReturn}</a>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?view=diff&rev=508576&r1=508575&r2=508576
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Fri Feb
16 12:49:10 2007
@@ -56,9 +56,6 @@
<platform-specific>
<html><html-template
location="component://order/webapp/ordermgr/order/transitions.ftl"/></html>
</platform-specific>
- <container>
- <link
target="loadCartFromOrder?orderId=${parameters.orderId}&finalizeMode=init"
text="${uiLabelMap.OrderCreateOrder}" style="buttontext"/>
- </container>
</decorator-section>
</decorator-screen>
</widgets>
