svn commit: r1744948 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml template/order/OrderItems.ftl

[diveshdutta]

Author: diveshdutta
Date: Sat May 21 13:56:57 2016
New Revision: 1744948

URL: http://svn.apache.org/viewvc?rev=1744948&view=rev
Log:
[OFBIZ-7102] When PO is created and approved and user adds new item in PO, new item is in created status. Now we have a button to approve that item , thought that button's name is misleading. Changed button name from Approve Order to Approve item.

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/template/order/OrderItems.ftl

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1744948&r1=1744947&r2=1744948&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sat May 21 13:56:57 2016
@@ -2206,6 +2206,9 @@
         <value xml:lang="zh-CN">任意订单类型</value>
         <value xml:lang="zh-TW">任何訂單類型</value>
     </property>
+    <property key="OrderApproveItem">
+        <value xml:lang="en">Approve Item</value>
+    </property>
     <property key="OrderApproveOrder">
         <value xml:lang="ar">الموافقة على أمر البيع\الشراء</value>
         <value xml:lang="de">Auftrag bestätigen</value>

Modified: ofbiz/trunk/applications/order/template/order/OrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/OrderItems.ftl?rev=1744948&r1=1744947&r2=1744948&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/order/OrderItems.ftl (original)
+++ ofbiz/trunk/applications/order/template/order/OrderItems.ftl Sat May 21 13:56:57 2016
@@ -195,7 +195,7 @@ under the License.
                                             </div>
                                             <#if ("ITEM_CREATED" == (currentItemStatus.statusId) && "ORDER_APPROVED" == (orderHeader.statusId)) && security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
                                                 <div>
-                                                    <a href="javascript:document.OrderApproveOrderItem_${orderItem.orderItemSeqId?default("")}.submit()" class="buttontext">${uiLabelMap.OrderApproveOrder}</a>
+                                                    <a href="javascript:document.OrderApproveOrderItem_${orderItem.orderItemSeqId?default("")}.submit()" class="buttontext">${uiLabelMap.OrderApproveItem}</a>
                                                     <form name="OrderApproveOrderItem_${orderItem.orderItemSeqId?default("")}" method="post" action="<@ofbizUrl>changeOrderItemStatus</@ofbizUrl>">
                                                         <input type="hidden" name="statusId" value="ITEM_APPROVED"/>
                                                         <input type="hidden" name="orderId" value="${orderId!}"/>