You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/12/11 22:00:27 UTC
svn commit: r1550258 - in /ofbiz/trunk/applications/order:
config/OrderUiLabels.xml webapp/ordermgr/order/editorderitems.ftl
Author: jleroux
Date: Wed Dec 11 21:00:27 2013
New Revision: 1550258
URL: http://svn.apache.org/r1550258
Log:
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/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1550258&r1=1550257&r2=1550258&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Wed Dec 11 21:00:27 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/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=1550258&r1=1550257&r2=1550258&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Wed Dec 11 21:00:27 2013
@@ -242,21 +242,24 @@ under the License.
<#if orderItemShipGroupAssocs?has_content>
<tr><td colspan="8"> </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> [${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"> </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='<@o...@ofbizUrl>';document.updateItemInfo.orderItemSeqId.value='${orderItem.orderItemSeqId}';document.updateItemInfo.shipGroupSeqId.value='${shipGroup.shipGroupSeqId}';document.updateItemInfo.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
<#else>