svn commit: r1550259 - in /ofbiz/branches/release13.07: ./ applications/order/config/OrderUiLabels.xml applications/order/webapp/ordermgr/order/editorderitems.ftl

Author: jleroux
Date: Wed Dec 11 21:02:22 2013
New Revision: 1550259

URL: http://svn.apache.org/r1550259
Log:
"Applied fix from trunk for revision: 1550258"
------------------------------------------------------------------------
r1550258 | jleroux | 2013-12-11 22:00:27 +0100 (mer. 11 déc. 2013) | 3 lignes

No functional changes
This removes a tab introduced with Christian Carlow's patch for "Cancelled ship groups show incorrect quantities on edit order items page" OFBIZ-5405
It also puts the quantity check box near the quantity to avoid any confusion and modify the related label to clarify (English and French only), incidentally this removes a tab introduced with Thaï labels
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/applications/order/config/OrderUiLabels.xml
    ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/editorderitems.ftl

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1550258

Modified: ofbiz/branches/release13.07/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/config/OrderUiLabels.xml?rev=1550259&r1=1550258&r2=1550259&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/release13.07/applications/order/config/OrderUiLabels.xml Wed Dec 11 21:02:22 2013
@@ -7322,7 +7322,7 @@
         <value xml:lang="fr">Échec de la création du paiement : aucune préférence de paiement trouvée sous la référence : ${orderPaymentPreferenceId}</value>
         <value xml:lang="it">Fallita creazione Pagamento: Non è possibile trovare OrderPaymentPreference con orderPaymentPreferenceId: ${orderPaymentPreferenceId}</value>
         <value xml:lang="ja">支払の作成に失敗しました。注文支払設定が見つかりません。注文支払設定ID: ${orderPaymentPreferenceId}</value>
-     <value xml:lang="vi">Tạo thanh toán không thành công: không tìm thấy thiết lập thanh toán với Id : ${orderPaymentPreferenceId}</value>
+        <value xml:lang="vi">Tạo thanh toán không thành công: không tìm thấy thiết lập thanh toán với Id : ${orderPaymentPreferenceId}</value>
         <value xml:lang="zh">创建支付（Payment）时失败：无法找到标识为${orderPaymentPreferenceId}的订单支付设置（OrderPaymentPreference）</value>
     </property>
     <property key="OrderOrderPaymentCannotBeCreatedPayToPartyIdNotSet">
@@ -13721,9 +13721,9 @@
     </property>
     <property key="OrderUpdateItems">
         <value xml:lang="de">Elemente aktualisieren</value>
-        <value xml:lang="en">Update Items</value>
+        <value xml:lang="en">Update selected items</value>
         <value xml:lang="es">Actualización de los ítems</value>
-        <value xml:lang="fr">Mise à jour des lignes</value>
+        <value xml:lang="fr">Mise à jour des lignes sélectionnées</value>
         <value xml:lang="it">Righe Aggiornate</value>
         <value xml:lang="ja">アイテムを更新</value>
         <value xml:lang="nl">Items actualiseren</value>

Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=1550259&r1=1550258&r2=1550259&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/editorderitems.ftl Wed Dec 11 21:02:22 2013
@@ -242,21 +242,24 @@ under the License.
                       <#if orderItemShipGroupAssocs?has_content>
                           <tr><td colspan="8">&nbsp;</td></tr>
                           <#list orderItemShipGroupAssocs as shipGroupAssoc>
-                            <#assign shipGroupQty = shipGroupAssoc.quantity - shipGroupAssoc.cancelQuantity?default(0)>
+                                <#assign shipGroupQty = shipGroupAssoc.quantity - shipGroupAssoc.cancelQuantity?default(0)>
                               <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)>
                               <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists>
+                              <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)) && ("Y" != orderItem.isPromo?if_exists))>
+                              <#assign itemSelectable = (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")>
                               <tr>
                                   <td class="align-text" colspan="2">
                                       <span class="label">${uiLabelMap.OrderShipGroup}</span>&nbsp;[${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")}
                                   </td>
                                   <td align="center">
                                       <input type="text" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shipGroupQty?string.number}"/>
+                                      <#if itemSelectable>
+                                          <input type="checkbox" name="selectedItem" value="${orderItem.orderItemSeqId}" />
+                                      </#if>
                                   </td>
                                   <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")>
-                                          <input type="checkbox" name="selectedItem" value="${orderItem.orderItemSeqId}" />
+                                      <#if itemSelectable>
                                           <a href="javascript:document.updateItemInfo.action='<@ofbizUrl>cancelOrderItem</@ofbizUrl>';document.updateItemInfo.orderItemSeqId.value='${orderItem.orderItemSeqId}';document.updateItemInfo.shipGroupSeqId.value='${shipGroup.shipGroupSeqId}';document.updateItemInfo.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
                                       <#else>
                                           &nbsp;