svn commit: r508470 - in /ofbiz/trunk: applications/order/data/OrderTypeData.xml applications/order/webapp/ordermgr/order/orderinfo.ftl framework/common/config/CommonEntityLabels.properties

[sichen]

Author: sichen
Date: Fri Feb 16 08:20:24 2007
New Revision: 508470

URL: http://svn.apache.org/viewvc?view=rev&rev=508470
Log:
Introducing the ORDER_HOLD order status
- valid transitions from ORDER_APPROVED and to ORDER_APPROVED, ORDER_CANCELLED
- supporting links in orderview screen

Modified:
    ofbiz/trunk/applications/order/data/OrderTypeData.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
    ofbiz/trunk/framework/common/config/CommonEntityLabels.properties

Modified: ofbiz/trunk/applications/order/data/OrderTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderTypeData.xml?view=diff&rev=508470&r1=508469&r2=508470
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderTypeData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderTypeData.xml Fri Feb 16 08:20:24 2007
@@ -101,6 +101,7 @@
     <StatusItem description="Processing" sequenceId="04" statusCode="PROCESSING" statusId="ORDER_PROCESSING" statusTypeId="ORDER_STATUS"/>
     <StatusItem description="Approved" sequenceId="05" statusCode="APPROVED" statusId="ORDER_APPROVED" statusTypeId="ORDER_STATUS"/>
     <StatusItem description="Sent" sequenceId="03" statusCode="SENT" statusId="ORDER_SENT" statusTypeId="ORDER_STATUS"/>
+    <StatusItem description="Held" sequenceId="06" statusCode="HELD" statusId="ORDER_HOLD" statusTypeId="ORDER_STATUS"/>
     <StatusItem description="Completed" sequenceId="10" statusCode="COMPLETED" statusId="ORDER_COMPLETED" statusTypeId="ORDER_STATUS"/>
     <StatusItem description="Rejected" sequenceId="98" statusCode="REJECTED" statusId="ORDER_REJECTED" statusTypeId="ORDER_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="ORDER_CANCELLED" statusTypeId="ORDER_STATUS"/>
@@ -123,7 +124,10 @@
     <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_PROCESSING" transitionName="Hold Order"/>
     <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_COMPLETED" transitionName="Complete Order"/>
     <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
+    <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_HOLD" transitionName="Hold Order"/>
+    <StatusValidChange condition="" statusId="ORDER_HOLD" statusIdTo="ORDER_APPROVED" transitionName="Approve Order"/>
     <StatusValidChange condition="" statusId="ORDER_SENT" statusIdTo="ORDER_COMPLETED" transitionName="Order Completed"/>
+    <StatusValidChange condition="" statusId="ORDER_HOLD" statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
     <StatusValidChange condition="" statusId="ORDER_SENT" statusIdTo="ORDER_CANCELLED" transitionName="Order Cancelled"/>
     <StatusValidChange condition="" statusId="ITEM_CREATED" statusIdTo="ITEM_APPROVED" transitionName="Approve Item"/>
     <StatusValidChange condition="" statusId="ITEM_CREATED" statusIdTo="ITEM_REJECTED" transitionName="Reject Item"/>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?view=diff&rev=508470&r1=508469&r2=508470
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Fri Feb 16 08:20:24 2007
@@ -22,6 +22,10 @@
         <div class="boxlink">
             <#if currentStatus.statusId == "ORDER_CREATED" || currentStatus.statusId == "ORDER_PROCESSING">
                 <div class="tabletext"><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&amp;${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderApproveOrder}</a></div>
+            <#elseif currentStatus.statusId == "ORDER_APPROVED">
+                <div class="tabletext"><a href="<@ofbizUrl>changeOrderStatus/orderview?statusId=ORDER_HOLD&amp;${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderHold}</a></div>
+            <#elseif currentStatus.statusId == "ORDER_HOLD">
+                <div class="tabletext"><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&amp;${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderApproveOrder}</a></div>
             </#if>
             <#if setOrderCompleteOption>
                   <div class="tabletext"><a href="<@ofbizUrl>changeOrderStatus?orderId=${orderId}&statusId=ORDER_COMPLETED</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCompleteOrder}</a></div>

Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties?view=diff&rev=508470&r1=508469&r2=508470
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonEntityLabels.properties (original)
+++ ofbiz/trunk/framework/common/config/CommonEntityLabels.properties Fri Feb 16 08:20:24 2007
@@ -1131,8 +1131,11 @@
 StatusValidChange.transitionName.ORDER_APPROVED.ORDER_PROCESSING=Hold Order
 StatusValidChange.transitionName.ORDER_APPROVED.ORDER_COMPLETED=Complete Order
 StatusValidChange.transitionName.ORDER_APPROVED.ORDER_CANCELLED=Cancel Order
+StatusValidChange.transitionName.ORDER_APPROVED.ORDER_HOLD=Hold Order
 StatusValidChange.transitionName.ORDER_SENT.ORDER_COMPLETED=Order Completed
 StatusValidChange.transitionName.ORDER_SENT.ORDER_CANCELLED=Order Cancelled
+StatusValidChange.transitionName.ORDER_HOLD.ORDER_APPROVED=Approve Order
+StatusValidChange.transitionName.ORDER_HOLD.ORDER_CANCELLED=Cancel Order
 
 StatusValidChange.transitionName.ITEM_CREATED.ITEM_APPROVED=Approve Item
 StatusValidChange.transitionName.ITEM_CREATED.ITEM_REJECTED=Reject Item