OFBiz › OFBiz - Dev

Re: svn commit: r680663 - in /ofbiz/trunk: applications/ecommerce/webapp/ecommerce/order/ applications/order/data/ applications/order/src/org/ofbiz/order/order/ applications/order/webapp/ordermgr/order/ framework/common/config/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 3 messages Options
Scott Gray
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: svn commit: r680663 - in /ofbiz/trunk: applications/ecommerce/webapp/ecommerce/order/ applications/order/data/ applications/order/src/org/ofbiz/order/order/ applications/order/webapp/ordermgr/order/ framework/common/config/

Scott Gray
Hi Jacques

It seems a shame to remove this status completely, even if it's not
being used it appears to be a completely valid state for an order to
be in.  For example if a company required delivery confirmation this
would be a useful intermediate step between approved and completed.
Could we not just remove it from the order list ui if it is really
bothering people?

Regards
Scott

2008/7/29  <[hidden email]>:

> Author: jleroux
> Date: Tue Jul 29 03:23:17 2008
> New Revision: 680663
>
> URL: http://svn.apache.org/viewvc?rev=680663&view=rev
> Log:
> Removed ORDER_SENT status which was actually unused
>
> Modified:
>    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
>    ofbiz/trunk/applications/order/data/OrderTypeData.xml
>    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
>    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
>    ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
>    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
>    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
>    ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
>
> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=680663&r1=680662&r2=680663&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
> +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl Tue Jul 29 03:23:17 2008
> @@ -176,7 +176,7 @@
>               </#if>
>             </tr>
>             <#-- now cancel reason and comment field -->
> -            <#if maySelectItems?default("N") == "Y" && (orderHeader.statusId != "ORDER_SENT" && orderItem.statusId != "ITEM_COMPLETED" && orderItem.statusId != "ITEM_CANCELLED" && pickedQty == 0)>
> +            <#if maySelectItems?default("N") == "Y" && (orderItem.statusId != "ITEM_COMPLETED" && orderItem.statusId != "ITEM_CANCELLED" && pickedQty == 0)>
>                      <tr align="right"><td colspan="7"><div class="tabletext"><b>${uiLabelMap.OrderReturnReason}</b>
>                          <select name="irm_${orderItem.orderItemSeqId}" class="selectBox">
>                            <option value="">&nbsp;</option>
>
> Modified: ofbiz/trunk/applications/order/data/OrderTypeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderTypeData.xml?rev=680663&r1=680662&r2=680663&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/data/OrderTypeData.xml (original)
> +++ ofbiz/trunk/applications/order/data/OrderTypeData.xml Tue Jul 29 03:23:17 2008
> @@ -108,7 +108,6 @@
>     <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="ORDER_CREATED" statusTypeId="ORDER_STATUS"/>
>     <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"/>
> @@ -130,7 +129,6 @@
>     <StatusValidChange condition="" statusId="ORDER_PROCESSING" statusIdTo="ORDER_APPROVED" transitionName="Approve Order"/>
>     <StatusValidChange condition="" statusId="ORDER_PROCESSING" statusIdTo="ORDER_REJECTED" transitionName="Reject Order"/>
>     <StatusValidChange condition="" statusId="ORDER_PROCESSING" statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
> -    <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_SENT" transitionName="Send Order"/>
>     <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_PROCESSING" transitionName="Process Order"/>
>     <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_COMPLETED" transitionName="Complete Order"/>
>     <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
> @@ -138,8 +136,6 @@
>     <StatusValidChange condition="" statusId="ORDER_HOLD" statusIdTo="ORDER_PROCESSING" transitionName="Process Order"/>
>     <StatusValidChange condition="" statusId="ORDER_HOLD" statusIdTo="ORDER_APPROVED" transitionName="Approve Order"/>
>     <StatusValidChange condition="" statusId="ORDER_HOLD" statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
> -    <StatusValidChange condition="" statusId="ORDER_SENT" statusIdTo="ORDER_COMPLETED" transitionName="Order Completed"/>
> -    <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"/>
>     <StatusValidChange condition="" statusId="ITEM_CREATED" statusIdTo="ITEM_CANCELLED" transitionName="Cancel Item"/>
>
> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java?rev=680663&r1=680662&r2=680663&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java (original)
> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java Tue Jul 29 03:23:17 2008
> @@ -67,7 +67,6 @@
>         map.put("viewapproved", "ORDER_APPROVED");
>         map.put("viewcreated", "ORDER_CREATED");
>         map.put("viewprocessing", "ORDER_PROCESSING");
> -        map.put("viewsent", "ORDER_SENT");
>         map.put("viewhold", "ORDER_HOLD");
>         parameterToOrderStatusId = map;
>
>
> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=680663&r1=680662&r2=680663&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Tue Jul 29 03:23:17 2008
> @@ -1747,9 +1747,12 @@
>                     }
>                 }
>
> -                if ("ORDER_SENT".equals(orderHeaderStatusId)) changeToApprove = false;
> -                if ("ORDER_COMPLETED".equals(orderHeaderStatusId)) changeToApprove = false;
> -                if ("ORDER_CANCELLED".equals(orderHeaderStatusId)) changeToApprove = false;
> +                if ("ORDER_COMPLETED".equals(orderHeaderStatusId)) {
> +                    changeToApprove = false;
> +                }
> +                if ("ORDER_CANCELLED".equals(orderHeaderStatusId)) {
> +                    changeToApprove = false;
> +                }
>
>                 if (changeToApprove) {
>                     newStatus = "ORDER_APPROVED";
>
> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=680663&r1=680662&r2=680663&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Tue Jul 29 03:23:17 2008
> @@ -161,7 +161,7 @@
>                             </td>
>                             <td>&nbsp;</td>
>                             <td>
> -                                <#if ("Y" != orderItem.isPromo?if_exists) && ((security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED") || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && orderHeader.statusId != "ORDER_SENT"))>
> +                                <#if ("Y" != orderItem.isPromo?if_exists) && ((security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED") || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED"))>
>                                     <a href="javascript:document.updateItemInfo.action='<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&amp;${paramString}</@ofbizUrl>';document.updateItemInfo.submit()" class="buttontext">${uiLabelMap.CommonCancelAll}</a>
>                                 <#else>
>                                     &nbsp;
> @@ -234,7 +234,7 @@
>                                 <td colspan="4">&nbsp;</td>
>                                 <td>
>                                     <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)) && ("Y" != orderItem.isPromo?if_exists))>
> -                                    <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")>
> +                                    <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay)>
>                                         <a href="javascript:document.updateItemInfo.action='<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&amp;shipGroupSeqId=${shipGroup.shipGroupSeqId}&amp;${paramString}</@ofbizUrl>';document.updateItemInfo.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
>                                     <#else>
>                                         &nbsp;
>
> 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=680663&r1=680662&r2=680663&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Tue Jul 29 03:23:17 2008
> @@ -75,7 +75,6 @@
>                     <input type="checkbox" name="viewapproved" value="Y" <#if state.hasStatus('viewapproved')>checked="checked"</#if> />${uiLabelMap.CommonApproved}
>                     <input type="checkbox" name="viewhold" value="Y" <#if state.hasStatus('viewhold')>checked="checked"</#if> />${uiLabelMap.CommonHeld}
>                     <input type="checkbox" name="viewcompleted" value="Y" <#if state.hasStatus('viewcompleted')>checked="checked"</#if> />${uiLabelMap.CommonCompleted}
> -                    <input type="checkbox" name="viewsent" value="Y" <#if state.hasStatus('viewsent')>checked="checked"</#if> />${uiLabelMap.CommonSent}
>                     <input type="checkbox" name="viewrejected" value="Y" <#if state.hasStatus('viewrejected')>checked="checked"</#if> />${uiLabelMap.CommonRejected}
>                     <input type="checkbox" name="viewcancelled" value="Y" <#if state.hasStatus('viewcancelled')>checked="checked"</#if> />${uiLabelMap.CommonCancelled}
>                 </div>
>
> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=680663&r1=680662&r2=680663&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue Jul 29 03:23:17 2008
> @@ -258,7 +258,7 @@
>        </#if>
>
>        <#-- shipment actions -->
> -       <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && ((orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))>
> +       <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderHeader.statusId == "ORDER_APPROVED">
>
>          <#-- Special shipment options -->
>          <#if security.hasEntityPermission("FACILITY", "_CREATE", session)>
>
> Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=680663&r1=680662&r2=680663&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original)
> +++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Tue Jul 29 03:23:17 2008
> @@ -6121,17 +6121,6 @@
>         <value xml:lang="th">ปภิเสธ</value>
>         <value xml:lang="zh">å·²æ‹'ç» </value>
>     </property>
> -    <property key="StatusItem.description.ORDER_SENT">
> -        <value xml:lang="de">Ãœbermittelt</value>
> -        <value xml:lang="en">Sent</value>
> -        <value xml:lang="fr">EnvoyÃ(c)</value>
> -        <value xml:lang="it">Inviato</value>
> -        <value xml:lang="pt">Enviada</value>
> -        <value xml:lang="ro">Transmisa</value>
> -        <value xml:lang="ru">ÐžÑ‚Ð¾Ñ Ð»Ð°Ð½</value>
> -        <value xml:lang="th">ส่ง</value>
> -        <value xml:lang="zh">å·²å 'é€ </value>
> -    </property>
>     <property key="StatusItem.description.PAYMENT_AUTHORIZED">
>         <value xml:lang="de">Autorisiert</value>
>         <value xml:lang="en">Authorized</value>
> @@ -8512,16 +8501,6 @@
>         <value xml:lang="th">ภารควบคุมรายภารสั่งซื้อ</value>
>         <value xml:lang="zh">ä¿ ç•™è(R)¢å •</value>
>     </property>
> -    <property key="StatusValidChange.transitionName.ORDER_APPROVED.ORDER_SENT">
> -        <value xml:lang="de">Auftrag übermitteln</value>
> -        <value xml:lang="en">Send Order</value>
> -        <value xml:lang="it">Invia Ordine</value>
> -        <value xml:lang="pt">Enviar Encomenda</value>
> -        <value xml:lang="ro">Trimite Comanda</value>
> -        <value xml:lang="ru">ÐžÑ‚Ð¾Ñ Ð»Ð°Ñ‚ÑŒ заказ</value>
> -        <value xml:lang="th">ส่งรายภารสั่งซื้อ</value>
> -        <value xml:lang="zh">å 'é€ è(R)¢å •</value>
> -    </property>
>     <property key="StatusValidChange.transitionName.ORDER_CREATED.ORDER_APPROVED">
>         <value xml:lang="de">Auftrag genehmigen</value>
>         <value xml:lang="en">Approve Order</value>
> @@ -8606,26 +8585,6 @@
>         <value xml:lang="th">ปภิเสธรายภารสั่งซื้อ</value>
>         <value xml:lang="zh">æ‹'ç» è(R)¢å •</value>
>     </property>
> -    <property key="StatusValidChange.transitionName.ORDER_SENT.ORDER_CANCELLED">
> -        <value xml:lang="de">Auftrag ablehnen</value>
> -        <value xml:lang="en">Order Cancelled</value>
> -        <value xml:lang="it">Ordine Cancellato</value>
> -        <value xml:lang="pt">Encomenda Cancelada</value>
> -        <value xml:lang="ro">Comanda Stearsa</value>
> -        <value xml:lang="ru">Заказ отменен</value>
> -        <value xml:lang="th">ยภเลิภรายภารสั่งซื้อ</value>
> -        <value xml:lang="zh">è(R)¢å •å·²å –消</value>
> -    </property>
> -    <property key="StatusValidChange.transitionName.ORDER_SENT.ORDER_COMPLETED">
> -        <value xml:lang="de">Auftrag abgeschlossen</value>
> -        <value xml:lang="en">Order Completed</value>
> -        <value xml:lang="it">Ordine Completato</value>
> -        <value xml:lang="pt">Encomenda Completa</value>
> -        <value xml:lang="ro">Comanda Completata</value>
> -        <value xml:lang="ru">Заказ завершен</value>
> -        <value xml:lang="th">รายภารสั่งซื้อเสร็จสมบูรà¸"์</value>
> -        <value xml:lang="zh">è(R)¢å •å·²å(R)Œæˆ </value>
> -    </property>
>     <property key="StatusValidChange.transitionName.PARTY_ENABLED.PARTY_DISABLED">
>         <value xml:lang="de">Deaktiviert</value>
>         <value xml:lang="en">Disable</value>
>
>
>
Jacques Le Roux
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: svn commit: r680663 - in /ofbiz/trunk: applications/ecommerce/webapp/ecommerce/order/ applications/order/data/ applications/order/src/org/ofbiz/order/order/ applications/order/webapp/ordermgr/order/ framework/common/config/

Jacques Le Roux
Administrator
Hi Scott,

Yes, I hesitated before doing it. I will revert and simply hide the unused state in UI (order list and search)

Cheers

Jacques

From: "Scott Gray" <[hidden email]>

> Hi Jacques
>
> It seems a shame to remove this status completely, even if it's not
> being used it appears to be a completely valid state for an order to
> be in.  For example if a company required delivery confirmation this
> would be a useful intermediate step between approved and completed.
> Could we not just remove it from the order list ui if it is really
> bothering people?
>
> Regards
> Scott
>
> 2008/7/29  <[hidden email]>:
>> Author: jleroux
>> Date: Tue Jul 29 03:23:17 2008
>> New Revision: 680663
>>
>> URL: http://svn.apache.org/viewvc?rev=680663&view=rev
>> Log:
>> Removed ORDER_SENT status which was actually unused
>>
>> Modified:
>>    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
>>    ofbiz/trunk/applications/order/data/OrderTypeData.xml
>>    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
>>    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
>>    ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
>>    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
>>    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
>>    ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
>>
>> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=680663&r1=680662&r2=680663&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
>> +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl Tue Jul 29 03:23:17 2008
>> @@ -176,7 +176,7 @@
>>               </#if>
>>             </tr>
>>             <#-- now cancel reason and comment field -->
>> -            <#if maySelectItems?default("N") == "Y" && (orderHeader.statusId != "ORDER_SENT" && orderItem.statusId !=
>> "ITEM_COMPLETED" && orderItem.statusId != "ITEM_CANCELLED" && pickedQty == 0)>
>> +            <#if maySelectItems?default("N") == "Y" && (orderItem.statusId != "ITEM_COMPLETED" && orderItem.statusId !=
>> "ITEM_CANCELLED" && pickedQty == 0)>
>>                      <tr align="right"><td colspan="7"><div class="tabletext"><b>${uiLabelMap.OrderReturnReason}</b>
>>                          <select name="irm_${orderItem.orderItemSeqId}" class="selectBox">
>>                            <option value="">&nbsp;</option>
>>
>> Modified: ofbiz/trunk/applications/order/data/OrderTypeData.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderTypeData.xml?rev=680663&r1=680662&r2=680663&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/data/OrderTypeData.xml (original)
>> +++ ofbiz/trunk/applications/order/data/OrderTypeData.xml Tue Jul 29 03:23:17 2008
>> @@ -108,7 +108,6 @@
>>     <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="ORDER_CREATED" statusTypeId="ORDER_STATUS"/>
>>     <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"/>
>> @@ -130,7 +129,6 @@
>>     <StatusValidChange condition="" statusId="ORDER_PROCESSING" statusIdTo="ORDER_APPROVED" transitionName="Approve Order"/>
>>     <StatusValidChange condition="" statusId="ORDER_PROCESSING" statusIdTo="ORDER_REJECTED" transitionName="Reject Order"/>
>>     <StatusValidChange condition="" statusId="ORDER_PROCESSING" statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
>> -    <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_SENT" transitionName="Send Order"/>
>>     <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_PROCESSING" transitionName="Process Order"/>
>>     <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_COMPLETED" transitionName="Complete Order"/>
>>     <StatusValidChange condition="" statusId="ORDER_APPROVED" statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
>> @@ -138,8 +136,6 @@
>>     <StatusValidChange condition="" statusId="ORDER_HOLD" statusIdTo="ORDER_PROCESSING" transitionName="Process Order"/>
>>     <StatusValidChange condition="" statusId="ORDER_HOLD" statusIdTo="ORDER_APPROVED" transitionName="Approve Order"/>
>>     <StatusValidChange condition="" statusId="ORDER_HOLD" statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
>> -    <StatusValidChange condition="" statusId="ORDER_SENT" statusIdTo="ORDER_COMPLETED" transitionName="Order Completed"/>
>> -    <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"/>
>>     <StatusValidChange condition="" statusId="ITEM_CREATED" statusIdTo="ITEM_CANCELLED" transitionName="Cancel Item"/>
>>
>> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java?rev=680663&r1=680662&r2=680663&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java (original)
>> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java Tue Jul 29 03:23:17 2008
>> @@ -67,7 +67,6 @@
>>         map.put("viewapproved", "ORDER_APPROVED");
>>         map.put("viewcreated", "ORDER_CREATED");
>>         map.put("viewprocessing", "ORDER_PROCESSING");
>> -        map.put("viewsent", "ORDER_SENT");
>>         map.put("viewhold", "ORDER_HOLD");
>>         parameterToOrderStatusId = map;
>>
>>
>> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=680663&r1=680662&r2=680663&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
>> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Tue Jul 29 03:23:17 2008
>> @@ -1747,9 +1747,12 @@
>>                     }
>>                 }
>>
>> -                if ("ORDER_SENT".equals(orderHeaderStatusId)) changeToApprove = false;
>> -                if ("ORDER_COMPLETED".equals(orderHeaderStatusId)) changeToApprove = false;
>> -                if ("ORDER_CANCELLED".equals(orderHeaderStatusId)) changeToApprove = false;
>> +                if ("ORDER_COMPLETED".equals(orderHeaderStatusId)) {
>> +                    changeToApprove = false;
>> +                }
>> +                if ("ORDER_CANCELLED".equals(orderHeaderStatusId)) {
>> +                    changeToApprove = false;
>> +                }
>>
>>                 if (changeToApprove) {
>>                     newStatus = "ORDER_APPROVED";
>>
>> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=680663&r1=680662&r2=680663&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
>> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Tue Jul 29 03:23:17 2008
>> @@ -161,7 +161,7 @@
>>                             </td>
>>                             <td>&nbsp;</td>
>>                             <td>
>> -                                <#if ("Y" != orderItem.isPromo?if_exists) && ((security.hasEntityPermission("ORDERMGR",
>> "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED") ||
>> (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId !=
>> "ITEM_COMPLETED" && orderHeader.statusId != "ORDER_SENT"))>
>> +                                <#if ("Y" != orderItem.isPromo?if_exists) && ((security.hasEntityPermission("ORDERMGR",
>> "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED") ||
>> (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId !=
>> "ITEM_COMPLETED"))>
>>                                     <a
>> href="javascript:document.updateItemInfo.action='<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&amp;${paramString}</@ofbizUrl>';document.updateItemInfo.submit()"
>> class="buttontext">${uiLabelMap.CommonCancelAll}</a>
>>                                 <#else>
>>                                     &nbsp;
>> @@ -234,7 +234,7 @@
>>                                 <td colspan="4">&nbsp;</td>
>>                                 <td>
>>                                     <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId !=
>> "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)) && ("Y" !=
>> orderItem.isPromo?if_exists))>
>> -                                    <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) ||
>> (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")>
>> +                                    <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) ||
>> (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay)>
>>                                         <a
>> href="javascript:document.updateItemInfo.action='<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&amp;shipGroupSeqId=${shipGroup.shipGroupSeqId}&amp;${paramString}</@ofbizUrl>';document.updateItemInfo.submit()"
>> class="buttontext">${uiLabelMap.CommonCancel}</a>
>>                                     <#else>
>>                                         &nbsp;
>>
>> 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=680663&r1=680662&r2=680663&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
>> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Tue Jul 29 03:23:17 2008
>> @@ -75,7 +75,6 @@
>>                     <input type="checkbox" name="viewapproved" value="Y" <#if
>> state.hasStatus('viewapproved')>checked="checked"</#if> />${uiLabelMap.CommonApproved}
>>                     <input type="checkbox" name="viewhold" value="Y" <#if state.hasStatus('viewhold')>checked="checked"</#if>
>> />${uiLabelMap.CommonHeld}
>>                     <input type="checkbox" name="viewcompleted" value="Y" <#if
>> state.hasStatus('viewcompleted')>checked="checked"</#if> />${uiLabelMap.CommonCompleted}
>> -                    <input type="checkbox" name="viewsent" value="Y" <#if state.hasStatus('viewsent')>checked="checked"</#if>
>> />${uiLabelMap.CommonSent}
>>                     <input type="checkbox" name="viewrejected" value="Y" <#if
>> state.hasStatus('viewrejected')>checked="checked"</#if> />${uiLabelMap.CommonRejected}
>>                     <input type="checkbox" name="viewcancelled" value="Y" <#if
>> state.hasStatus('viewcancelled')>checked="checked"</#if> />${uiLabelMap.CommonCancelled}
>>                 </div>
>>
>> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=680663&r1=680662&r2=680663&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
>> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue Jul 29 03:23:17 2008
>> @@ -258,7 +258,7 @@
>>        </#if>
>>
>>        <#-- shipment actions -->
>> -       <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && ((orderHeader.statusId == "ORDER_APPROVED") ||
>> (orderHeader.statusId == "ORDER_SENT"))>
>> +       <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderHeader.statusId == "ORDER_APPROVED">
>>
>>          <#-- Special shipment options -->
>>          <#if security.hasEntityPermission("FACILITY", "_CREATE", session)>
>>
>> Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=680663&r1=680662&r2=680663&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original)
>> +++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Tue Jul 29 03:23:17 2008
>> @@ -6121,17 +6121,6 @@
>>         <value xml:lang="th">ปภิเสธ</value>
>>         <value xml:lang="zh">å·²æ‹'ç» </value>
>>     </property>
>> -    <property key="StatusItem.description.ORDER_SENT">
>> -        <value xml:lang="de">Ãœbermittelt</value>
>> -        <value xml:lang="en">Sent</value>
>> -        <value xml:lang="fr">EnvoyÃ(c)</value>
>> -        <value xml:lang="it">Inviato</value>
>> -        <value xml:lang="pt">Enviada</value>
>> -        <value xml:lang="ro">Transmisa</value>
>> -        <value xml:lang="ru">ÐžÑ‚Ð¾Ñ Ð»Ð°Ð½</value>
>> -        <value xml:lang="th">ส่ง</value>
>> -        <value xml:lang="zh">å·²å 'é€ </value>
>> -    </property>
>>     <property key="StatusItem.description.PAYMENT_AUTHORIZED">
>>         <value xml:lang="de">Autorisiert</value>
>>         <value xml:lang="en">Authorized</value>
>> @@ -8512,16 +8501,6 @@
>>         <value xml:lang="th">ภารควบคุมรายภารสั่งซื้อ</value>
>>         <value xml:lang="zh">ä¿ ç•™è(R)¢å •</value>
>>     </property>
>> -    <property key="StatusValidChange.transitionName.ORDER_APPROVED.ORDER_SENT">
>> -        <value xml:lang="de">Auftrag übermitteln</value>
>> -        <value xml:lang="en">Send Order</value>
>> -        <value xml:lang="it">Invia Ordine</value>
>> -        <value xml:lang="pt">Enviar Encomenda</value>
>> -        <value xml:lang="ro">Trimite Comanda</value>
>> -        <value xml:lang="ru">ÐžÑ‚Ð¾Ñ Ð»Ð°Ñ‚ÑŒ заказ</value>
>> -        <value xml:lang="th">ส่งรายภารสั่งซื้อ</value>
>> -        <value xml:lang="zh">å 'é€ è(R)¢å •</value>
>> -    </property>
>>     <property key="StatusValidChange.transitionName.ORDER_CREATED.ORDER_APPROVED">
>>         <value xml:lang="de">Auftrag genehmigen</value>
>>         <value xml:lang="en">Approve Order</value>
>> @@ -8606,26 +8585,6 @@
>>         <value xml:lang="th">ปภิเสธรายภารสั่งซื้อ</value>
>>         <value xml:lang="zh">æ‹'ç» è(R)¢å •</value>
>>     </property>
>> -    <property key="StatusValidChange.transitionName.ORDER_SENT.ORDER_CANCELLED">
>> -        <value xml:lang="de">Auftrag ablehnen</value>
>> -        <value xml:lang="en">Order Cancelled</value>
>> -        <value xml:lang="it">Ordine Cancellato</value>
>> -        <value xml:lang="pt">Encomenda Cancelada</value>
>> -        <value xml:lang="ro">Comanda Stearsa</value>
>> -        <value xml:lang="ru">Заказ отменен</value>
>> -        <value xml:lang="th">ยภเลิภรายภารสั่งซื้อ</value>
>> -        <value xml:lang="zh">è(R)¢å •å·²å –消</value>
>> -    </property>
>> -    <property key="StatusValidChange.transitionName.ORDER_SENT.ORDER_COMPLETED">
>> -        <value xml:lang="de">Auftrag abgeschlossen</value>
>> -        <value xml:lang="en">Order Completed</value>
>> -        <value xml:lang="it">Ordine Completato</value>
>> -        <value xml:lang="pt">Encomenda Completa</value>
>> -        <value xml:lang="ro">Comanda Completata</value>
>> -        <value xml:lang="ru">Заказ завершен</value>
>> -        <value xml:lang="th">รายภารสั่งซื้อเสร็จสมบูรà¸"์</value>
>> -        <value xml:lang="zh">è(R)¢å •å·²å(R)Œæˆ </value>
>> -    </property>
>>     <property key="StatusValidChange.transitionName.PARTY_ENABLED.PARTY_DISABLED">
>>         <value xml:lang="de">Deaktiviert</value>
>>         <value xml:lang="en">Disable</value>
>>
>>
>>
>

Scott Gray
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: svn commit: r680663 - in /ofbiz/trunk: applications/ecommerce/webapp/ecommerce/order/ applications/order/data/ applications/order/src/org/ofbiz/order/order/ applications/order/webapp/ordermgr/order/ framework/common/config/

Scott Gray
Thanks Jacques

2008/7/29 Jacques Le Roux <[hidden email]>:

> Hi Scott,
>
> Yes, I hesitated before doing it. I will revert and simply hide the unused
> state in UI (order list and search)
>
> Cheers
>
> Jacques
>
> From: "Scott Gray" <[hidden email]>
>>
>> Hi Jacques
>>
>> It seems a shame to remove this status completely, even if it's not
>> being used it appears to be a completely valid state for an order to
>> be in.  For example if a company required delivery confirmation this
>> would be a useful intermediate step between approved and completed.
>> Could we not just remove it from the order list ui if it is really
>> bothering people?
>>
>> Regards
>> Scott
>>
>> 2008/7/29  <[hidden email]>:
>>>
>>> Author: jleroux
>>> Date: Tue Jul 29 03:23:17 2008
>>> New Revision: 680663
>>>
>>> URL: http://svn.apache.org/viewvc?rev=680663&view=rev
>>> Log:
>>> Removed ORDER_SENT status which was actually unused
>>>
>>> Modified:
>>>
>>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
>>>   ofbiz/trunk/applications/order/data/OrderTypeData.xml
>>>
>>> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
>>>
>>> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
>>>   ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
>>>   ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
>>>
>>> ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
>>>   ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
>>>
>>> Modified:
>>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=680663&r1=680662&r2=680663&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
>>> (original)
>>> +++
>>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl Tue
>>> Jul 29 03:23:17 2008
>>> @@ -176,7 +176,7 @@
>>>              </#if>
>>>            </tr>
>>>            <#-- now cancel reason and comment field -->
>>> -            <#if maySelectItems?default("N") == "Y" &&
>>> (orderHeader.statusId != "ORDER_SENT" && orderItem.statusId !=
>>> "ITEM_COMPLETED" && orderItem.statusId != "ITEM_CANCELLED" && pickedQty ==
>>> 0)>
>>> +            <#if maySelectItems?default("N") == "Y" &&
>>> (orderItem.statusId != "ITEM_COMPLETED" && orderItem.statusId !=
>>> "ITEM_CANCELLED" && pickedQty == 0)>
>>>                     <tr align="right"><td colspan="7"><div
>>> class="tabletext"><b>${uiLabelMap.OrderReturnReason}</b>
>>>                         <select name="irm_${orderItem.orderItemSeqId}"
>>> class="selectBox">
>>>                           <option value="">&nbsp;</option>
>>>
>>> Modified: ofbiz/trunk/applications/order/data/OrderTypeData.xml
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderTypeData.xml?rev=680663&r1=680662&r2=680663&view=diff
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/data/OrderTypeData.xml (original)
>>> +++ ofbiz/trunk/applications/order/data/OrderTypeData.xml Tue Jul 29
>>> 03:23:17 2008
>>> @@ -108,7 +108,6 @@
>>>    <StatusItem description="Created" sequenceId="01" statusCode="CREATED"
>>> statusId="ORDER_CREATED" statusTypeId="ORDER_STATUS"/>
>>>    <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"/>
>>> @@ -130,7 +129,6 @@
>>>    <StatusValidChange condition="" statusId="ORDER_PROCESSING"
>>> statusIdTo="ORDER_APPROVED" transitionName="Approve Order"/>
>>>    <StatusValidChange condition="" statusId="ORDER_PROCESSING"
>>> statusIdTo="ORDER_REJECTED" transitionName="Reject Order"/>
>>>    <StatusValidChange condition="" statusId="ORDER_PROCESSING"
>>> statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
>>> -    <StatusValidChange condition="" statusId="ORDER_APPROVED"
>>> statusIdTo="ORDER_SENT" transitionName="Send Order"/>
>>>    <StatusValidChange condition="" statusId="ORDER_APPROVED"
>>> statusIdTo="ORDER_PROCESSING" transitionName="Process Order"/>
>>>    <StatusValidChange condition="" statusId="ORDER_APPROVED"
>>> statusIdTo="ORDER_COMPLETED" transitionName="Complete Order"/>
>>>    <StatusValidChange condition="" statusId="ORDER_APPROVED"
>>> statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
>>> @@ -138,8 +136,6 @@
>>>    <StatusValidChange condition="" statusId="ORDER_HOLD"
>>> statusIdTo="ORDER_PROCESSING" transitionName="Process Order"/>
>>>    <StatusValidChange condition="" statusId="ORDER_HOLD"
>>> statusIdTo="ORDER_APPROVED" transitionName="Approve Order"/>
>>>    <StatusValidChange condition="" statusId="ORDER_HOLD"
>>> statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
>>> -    <StatusValidChange condition="" statusId="ORDER_SENT"
>>> statusIdTo="ORDER_COMPLETED" transitionName="Order Completed"/>
>>> -    <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"/>
>>>    <StatusValidChange condition="" statusId="ITEM_CREATED"
>>> statusIdTo="ITEM_CANCELLED" transitionName="Cancel Item"/>
>>>
>>> Modified:
>>> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java?rev=680663&r1=680662&r2=680663&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
>>> (original)
>>> +++
>>> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
>>> Tue Jul 29 03:23:17 2008
>>> @@ -67,7 +67,6 @@
>>>        map.put("viewapproved", "ORDER_APPROVED");
>>>        map.put("viewcreated", "ORDER_CREATED");
>>>        map.put("viewprocessing", "ORDER_PROCESSING");
>>> -        map.put("viewsent", "ORDER_SENT");
>>>        map.put("viewhold", "ORDER_HOLD");
>>>        parameterToOrderStatusId = map;
>>>
>>>
>>> Modified:
>>> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=680663&r1=680662&r2=680663&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
>>> (original)
>>> +++
>>> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
>>> Tue Jul 29 03:23:17 2008
>>> @@ -1747,9 +1747,12 @@
>>>                    }
>>>                }
>>>
>>> -                if ("ORDER_SENT".equals(orderHeaderStatusId))
>>> changeToApprove = false;
>>> -                if ("ORDER_COMPLETED".equals(orderHeaderStatusId))
>>> changeToApprove = false;
>>> -                if ("ORDER_CANCELLED".equals(orderHeaderStatusId))
>>> changeToApprove = false;
>>> +                if ("ORDER_COMPLETED".equals(orderHeaderStatusId)) {
>>> +                    changeToApprove = false;
>>> +                }
>>> +                if ("ORDER_CANCELLED".equals(orderHeaderStatusId)) {
>>> +                    changeToApprove = false;
>>> +                }
>>>
>>>                if (changeToApprove) {
>>>                    newStatus = "ORDER_APPROVED";
>>>
>>> Modified:
>>> ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=680663&r1=680662&r2=680663&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
>>> (original)
>>> +++
>>> ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Tue
>>> Jul 29 03:23:17 2008
>>> @@ -161,7 +161,7 @@
>>>                            </td>
>>>                            <td>&nbsp;</td>
>>>                            <td>
>>> -                                <#if ("Y" !=
>>> orderItem.isPromo?if_exists) && ((security.hasEntityPermission("ORDERMGR",
>>> "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" &&
>>> orderItem.statusId != "ITEM_COMPLETED") ||
>>> (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) &&
>>> orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId !=
>>> "ITEM_COMPLETED" && orderHeader.statusId != "ORDER_SENT"))>
>>> +                                <#if ("Y" !=
>>> orderItem.isPromo?if_exists) && ((security.hasEntityPermission("ORDERMGR",
>>> "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" &&
>>> orderItem.statusId != "ITEM_COMPLETED") ||
>>> (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) &&
>>> orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId !=
>>> "ITEM_COMPLETED"))>
>>>                                    <a
>>> href="javascript:document.updateItemInfo.action='<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&amp;${paramString}</@ofbizUrl>';document.updateItemInfo.submit()"
>>> class="buttontext">${uiLabelMap.CommonCancelAll}</a>
>>>                                <#else>
>>>                                    &nbsp;
>>> @@ -234,7 +234,7 @@
>>>                                <td colspan="4">&nbsp;</td>
>>>                                <td>
>>>                                    <#assign itemStatusOkay =
>>> (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId !=
>>> "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) <
>>> shipGroupAssoc.quantity?default(0)) && ("Y" !=
>>> orderItem.isPromo?if_exists))>
>>> -                                    <#if
>>> (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) &&
>>> itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE",
>>> session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")>
>>> +                                    <#if
>>> (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) &&
>>> itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE",
>>> session) && itemStatusOkay)>
>>>                                        <a
>>> href="javascript:document.updateItemInfo.action='<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&amp;shipGroupSeqId=${shipGroup.shipGroupSeqId}&amp;${paramString}</@ofbizUrl>';document.updateItemInfo.submit()"
>>> class="buttontext">${uiLabelMap.CommonCancel}</a>
>>>                                    <#else>
>>>                                        &nbsp;
>>>
>>> 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=680663&r1=680662&r2=680663&view=diff
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
>>> (original)
>>> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
>>> Tue Jul 29 03:23:17 2008
>>> @@ -75,7 +75,6 @@
>>>                    <input type="checkbox" name="viewapproved" value="Y"
>>> <#if state.hasStatus('viewapproved')>checked="checked"</#if>
>>> />${uiLabelMap.CommonApproved}
>>>                    <input type="checkbox" name="viewhold" value="Y" <#if
>>> state.hasStatus('viewhold')>checked="checked"</#if>
>>> />${uiLabelMap.CommonHeld}
>>>                    <input type="checkbox" name="viewcompleted" value="Y"
>>> <#if state.hasStatus('viewcompleted')>checked="checked"</#if>
>>> />${uiLabelMap.CommonCompleted}
>>> -                    <input type="checkbox" name="viewsent" value="Y"
>>> <#if state.hasStatus('viewsent')>checked="checked"</#if>
>>> />${uiLabelMap.CommonSent}
>>>                    <input type="checkbox" name="viewrejected" value="Y"
>>> <#if state.hasStatus('viewrejected')>checked="checked"</#if>
>>> />${uiLabelMap.CommonRejected}
>>>                    <input type="checkbox" name="viewcancelled" value="Y"
>>> <#if state.hasStatus('viewcancelled')>checked="checked"</#if>
>>> />${uiLabelMap.CommonCancelled}
>>>                </div>
>>>
>>> Modified:
>>> ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=680663&r1=680662&r2=680663&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
>>> (original)
>>> +++
>>> ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
>>> Tue Jul 29 03:23:17 2008
>>> @@ -258,7 +258,7 @@
>>>       </#if>
>>>
>>>       <#-- shipment actions -->
>>> -       <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)
>>> && ((orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId ==
>>> "ORDER_SENT"))>
>>> +       <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)
>>> && orderHeader.statusId == "ORDER_APPROVED">
>>>
>>>         <#-- Special shipment options -->
>>>         <#if security.hasEntityPermission("FACILITY", "_CREATE",
>>> session)>
>>>
>>> Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=680663&r1=680662&r2=680663&view=diff
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original)
>>> +++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Tue Jul 29
>>> 03:23:17 2008
>>> @@ -6121,17 +6121,6 @@
>>>        <value xml:lang="th">ปภิเสธ</value>
>>>        <value xml:lang="zh">å·²æ‹'ç» </value>
>>>    </property>
>>> -    <property key="StatusItem.description.ORDER_SENT">
>>> -        <value xml:lang="de">Ãœbermittelt</value>
>>> -        <value xml:lang="en">Sent</value>
>>> -        <value xml:lang="fr">EnvoyÃ(c)</value>
>>> -        <value xml:lang="it">Inviato</value>
>>> -        <value xml:lang="pt">Enviada</value>
>>> -        <value xml:lang="ro">Transmisa</value>
>>> -        <value xml:lang="ru">ÐžÑ‚Ð¾Ñ Ð»Ð°Ð½</value>
>>> -        <value xml:lang="th">ส่ง</value>
>>> -        <value xml:lang="zh">å·²å 'é€ </value>
>>> -    </property>
>>>    <property key="StatusItem.description.PAYMENT_AUTHORIZED">
>>>        <value xml:lang="de">Autorisiert</value>
>>>        <value xml:lang="en">Authorized</value>
>>> @@ -8512,16 +8501,6 @@
>>>        <value xml:lang="th">ภารควบคุมรายà¸
>>> ารสั่งซื้อ</value>
>>>        <value xml:lang="zh">ä¿ ç•™è(R)¢å •</value>
>>>    </property>
>>> -    <property
>>> key="StatusValidChange.transitionName.ORDER_APPROVED.ORDER_SENT">
>>> -        <value xml:lang="de">Auftrag übermitteln</value>
>>> -        <value xml:lang="en">Send Order</value>
>>> -        <value xml:lang="it">Invia Ordine</value>
>>> -        <value xml:lang="pt">Enviar Encomenda</value>
>>> -        <value xml:lang="ro">Trimite Comanda</value>
>>> -        <value xml:lang="ru">ÐžÑ‚Ð¾Ñ Ð»Ð°Ñ‚ÑŒ заказ</value>
>>> -        <value xml:lang="th">ส่งรายà¸
>>> ารสั่งซื้อ</value>
>>> -        <value xml:lang="zh">å 'é€ è(R)¢å •</value>
>>> -    </property>
>>>    <property
>>> key="StatusValidChange.transitionName.ORDER_CREATED.ORDER_APPROVED">
>>>        <value xml:lang="de">Auftrag genehmigen</value>
>>>        <value xml:lang="en">Approve Order</value>
>>> @@ -8606,26 +8585,6 @@
>>>        <value xml:lang="th">ปภิเสธรายà¸
>>> ารสั่งซื้อ</value>
>>>        <value xml:lang="zh">æ‹'ç» è(R)¢å •</value>
>>>    </property>
>>> -    <property
>>> key="StatusValidChange.transitionName.ORDER_SENT.ORDER_CANCELLED">
>>> -        <value xml:lang="de">Auftrag ablehnen</value>
>>> -        <value xml:lang="en">Order Cancelled</value>
>>> -        <value xml:lang="it">Ordine Cancellato</value>
>>> -        <value xml:lang="pt">Encomenda Cancelada</value>
>>> -        <value xml:lang="ro">Comanda Stearsa</value>
>>> -        <value xml:lang="ru">Заказ отменен</value>
>>> -        <value xml:lang="th">ยภเลิภรายà¸
>>> ารสั่งซื้อ</value>
>>> -        <value xml:lang="zh">è(R)¢å •å·²å –消</value>
>>> -    </property>
>>> -    <property
>>> key="StatusValidChange.transitionName.ORDER_SENT.ORDER_COMPLETED">
>>> -        <value xml:lang="de">Auftrag abgeschlossen</value>
>>> -        <value xml:lang="en">Order Completed</value>
>>> -        <value xml:lang="it">Ordine Completato</value>
>>> -        <value xml:lang="pt">Encomenda Completa</value>
>>> -        <value xml:lang="ro">Comanda Completata</value>
>>> -        <value xml:lang="ru">Заказ завершен</value>
>>> -        <value xml:lang="th">รายà¸
>>> ารสั่งซื้อเสร็จสมบูรà¸"์</value>
>>> -        <value xml:lang="zh">è(R)¢å •å·²å(R)Œæˆ </value>
>>> -    </property>
>>>    <property
>>> key="StatusValidChange.transitionName.PARTY_ENABLED.PARTY_DISABLED">
>>>        <value xml:lang="de">Deaktiviert</value>
>>>        <value xml:lang="en">Disable</value>
>>>
>>>
>>>
>>
>
>
Free forum by Nabble Edit this page