[OFBiz] SVN: r4018 - in trunk/components/order: config
webapp/ordermgr/entry webapp/ordermgr/order
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Mon Dec 6 21:11:59 EST 2004
Author: jonesde
Date: 2004-12-06 20:11:48 -0600 (Mon, 06 Dec 2004)
New Revision: 4018
Modified:
trunk/components/order/config/OrderUiLabels.properties
trunk/components/order/config/OrderUiLabels_fr.properties
trunk/components/order/webapp/ordermgr/entry/minicart.ftl
trunk/components/order/webapp/ordermgr/order/findOrders.ftl
trunk/components/order/webapp/ordermgr/order/newnote.ftl
trunk/components/order/webapp/ordermgr/order/orderheader.ftl
trunk/components/order/webapp/ordermgr/order/orderitems.ftl
trunk/components/order/webapp/ordermgr/order/ordernotes.ftl
Log:
Added i18n patch from Olivier Heintz
Modified: trunk/components/order/config/OrderUiLabels.properties
===================================================================
--- trunk/components/order/config/OrderUiLabels.properties 2004-12-04 12:12:03 UTC (rev 4017)
+++ trunk/components/order/config/OrderUiLabels.properties 2004-12-07 02:11:48 UTC (rev 4018)
@@ -12,6 +12,7 @@
AccountingCardType=Card Type
AccountingCompanyNameAccount=Company Name on Account
AccountingCompanyNameCard=Company Name on Card
+AccountingCurrency=Currency
AccountingCreditCard=Credit Card
AccountingEFTAccount=EFT Account
AccountingExpirationDate=Expiration Date
@@ -90,11 +91,17 @@
checkhelper.sales_order_lines_lookup_failed=ERROR: Sales Order Lines lookup failed.
checkhelpertotalsdonotmatchordertotal=Totals do not match order total.
+CommonAdd=Add
CommonAddDefault=Add Default
CommonAddressLine=Address Line
CommonAll=All
CommonAllowSolicitation=(allow solicitation?)
CommonAny=Any
+CommonAnyOrderStatus=Any Order Status
+CommonAnyOrderType=Any Order Type
+CommonAnyRoleType=Any Role Type
+CommonAnyStore=Any Store
+CommonAnyWebSite=Any Web Site
CommonAnyReturnStatus=Any return status
CommonApply=Apply
CommonAttentionName=Attention Name
@@ -104,6 +111,7 @@
CommonBy=By
CommonCancel=Cancel
CommonChange=Change
+CommonCancelAll=Cancel All
CommonCity=City
CommonComment=Comment
CommonContinue=Continue
@@ -118,6 +126,8 @@
CommonDescription=Description
CommonDetails=Details
CommonDisabled=disabled
+CommonEdit=Edit
+CommonGoBack=Go Back
CommonFind=Find
CommonFrom=From
CommonGroup=Group
@@ -149,6 +159,7 @@
CommonReports=Reports
CommonRequired=Required
CommonReturnStatus=Return Status
+CommonSave=Enregistrer
CommonSelectOne=Select One
CommonSelected=selected
CommonSet=Set
@@ -220,12 +231,16 @@
item.product_not_found=Product not found, not adding to cart. [productId\: ${productId}]
OrderAddCode=Add Code
+OrderAddNote=Add Note
OrderAddToOrder=Add To Order
OrderAdjustment=Adjustment
OrderAdjustments=Adjustments
+OrderAddress=Address
+OrderAllowSplit=Allow Split
OrderApproveOrder=Approve Order
OrderBeSureIncludeOrder=Be sure to include your order
OrderCancelAllItems=Cancel all Items
+OrderCancelled=Cancelled
OrderCannotBeChanged=(cannot be changed without clearing order.)
OrderCartTotal=Cart Total
OrderClearOrder=Clear Order
@@ -238,6 +253,7 @@
OrderCreateReturn=Create return
OrderCurrentStatus=Current Status
OrderCustomerPo=Custumer PO#
+OrderDate=Order Date
OrderDateOrdered=Date Ordered
OrderDesiredDeliveryDate=Desired Delivery Date
OrderDestination=Destination
@@ -259,16 +275,22 @@
OrderLookupOrder=Lookup Order(s)
OrderLookupReturn=Lookup Return(s)
OrderNoGiftWrap=No Gift Wrap
+OrderNoNotes=No notes for this order.
OrderNoOrderFound=No Order Found
OrderNoOrderItemsToDisplay=No order items to display.
+OrderNotShipped=Not Shipped
OrderNoReturnFound=No return found.
OrderNoReturnFoundWithId=No return found with return ID
+OrderNote=Note
+OrderNotes=Notes
+OrderNotesCreateNew=Create New
OrderNotUsedForPurchase=Not Used For Purchase Orders
OrderNotUsedForSales=Not Used For Sales Orders
OrderOfflineCheckMoney=Offline: Check/Money Order
OrderOrder=Order
OrderOrderConfirmation=Order Confirmation
OrderOrderDate=Order Date
+OrderOrdered=Ordered
OrderOrderEntry=Order Entry
OrderOrderEntryCustomerInfo=Order Entry Customer Info
OrderOrderEntryPaymentSettings=Order Entry Payment Settings
@@ -294,6 +316,7 @@
OrderQuantity=Quantity
OrderRecalculateOrder=Recalculate Order
OrderReceiveReturn=Receive Return
+OrderRemaining=Remaining
OrderRemainingSubTotal=Remaining SubTotal
OrderRequiredForSO=Required for SO
OrderReturned=Returned
@@ -309,11 +332,13 @@
OrderSelectPartyToOrder=Select type of party to associate to order
OrderSelectedGiftNotAvailableForAll=Selected Gift Wrap is not available for all items. The items which are available have been selected, the others remain unchanged.
OrderSendEmail=Send Email
+OrderShipGroup=Ship Group
OrderShipmentInformation=Shipment Information
OrderSplittingPreference=Splitting Preference
OrderStartDateTime=Start Date/Time
OrderStatusHistory=Status History
OrderSubTotal=Sub.Total
+OrderSurvey=Survey
OrderThisOrderGift=This order is a gift
OrderThisOrderNotGift=This order is not a gift
OrderTotalDue=Total Due
@@ -324,6 +349,7 @@
OrderUnitList=Unit / List
OrderUseDefaultComment=Use as default comment for next entry
OrderUseDefaultDesiredDeliveryDate=Use as default desired delivery date for next entry
+OrderViewEditDelivery=View/Delivery Schedule Info
OrderViewPermissionError=You do not have permission to view this page. ("ORDERMGR_VIEW" or "ORDERMGR_ADMIN" needed)
PageTitleLogin=Login
Modified: trunk/components/order/config/OrderUiLabels_fr.properties
===================================================================
--- trunk/components/order/config/OrderUiLabels_fr.properties 2004-12-04 12:12:03 UTC (rev 4017)
+++ trunk/components/order/config/OrderUiLabels_fr.properties 2004-12-07 02:11:48 UTC (rev 4018)
@@ -15,6 +15,7 @@
AccountingCompanyNameAccount=Nom de la soci\u00e9t\u00e9 sur le compte
AccountingCompanyNameCard=Nom de la soci\u00e9t\u00e9 sur la carte
AccountingCreditCard=Carte de Cr\u00e9dit
+AccountingCurrency=Devise
AccountingEFTAccount=R\u00e9f\u00e9rence bancaire
AccountingExpirationDate=Date d'expiration
AccountingFirstNameCard=Pr\u00e9nom sur la carte
@@ -30,6 +31,7 @@
AccountingPaymentAlreadyReceived=Paiement d\u00e9j\u00e0 re\u00e7u
AccountingPleaseSendPaymentTo=Merci d'envoyer le paiement \u00e0 :
AccountingPrefixCard=Pr\u00e9fixe sur la carte
+AccountingReceivePayment=Recevoir le paiement
AccountingRoutingNumber=Num\u00e9ro de routage
AccountingSuffixCard=Suffixe sur la carte
@@ -53,12 +55,20 @@
checkhelper.totals_do_not_match_order_total=Les totaux ne correspondent pas au total de la commande.
checkhelpertotalsdonotmatchordertotal=Les totaux ne correspondent pas au total de la commande.
+CommonAdd=Ajouter
CommonAddDefault=Ajouter les valeurs par d\u00E9faut
CommonAddressLine=Adresse
CommonAll=Tous
CommonAllowSolicitation=(N\u00e9cessite une autorisation?)
CommonAny=Un
+CommonAnyOrderStatus=Tout statut
+CommonAnyOrderType=Tout type
+CommonAnyReturnStatus=Tout Statut
+CommonAnyRoleType=Tout R\u00f4le
+CommonAnyStore=Toute marque
+CommonAnyWebSite=Tout Site
CommonApply=Valider
+CommonAt=\u00e0
CommonAttentionName=Nom d'attention
CommonAttn=Attention
CommonAnyReturnStatus=N'importe quel statut
@@ -66,6 +76,7 @@
CommonBenefit= Avantage
CommonBy=De
CommonCancel=Annuler
+CommonCancelAll=Tout annuler
CommonChange=Modifier
CommonCity=Ville
CommonComment=Commentaire
@@ -81,8 +92,10 @@
CommonDescription=Description
CommonDetails=D\u00e9tails
CommonDisabled=non permis
+CommonEdit=Modifier
CommonFind=Rechercher
CommonFrom=De
+CommonGoBack=Retour
CommonGroup=Groupe
CommonHideFields=Cacher les zones de s\u00e9lection
CommonIdentifier=Identifiant
@@ -111,6 +124,7 @@
CommonReports=Etats
CommonRequired=Obligatoire
CommonReturnStatus=Statut du retour
+CommonSave=Save
CommonSelectOne=S\u00e9lectionnez en une
CommonSelected=choisi
CommonSet=Action
@@ -178,11 +192,16 @@
item.product_not_found=Article non trouv\u00e9, pas d'ajout dans le panier. [r\u00e9f article\: ${productId}]
OrderAddCode=Ajouter un code promotion
+OrderAddNote=Ajouter une note
OrderAddToOrder=Ajouter \u00e0 la commande
OrderAdjustment=Ajustement
OrderAdjustments=Ajustements
+OrderAddress=Adresse
+OrderAllowSplit=Accepter le partiel
+OrderApproveOrder=Approuvez la commande
OrderBeSureIncludeOrder=Soyez s\u00fbr d'inclure votre ordre
OrderCancelAllItems=Supprimer tous les articles
+OrderCancelled=Annul\u00e9e
OrderCannotBeChanged=(Ne peut \u00eatre modifi\u00e9 sans r\u00e9initialis\u00e9 la commande.)
OrderCartTotal=Total du chariot
OrderChooseFollowingForGift=Vous pouvez \u00e9galement choisir parmi ces promotions
@@ -194,7 +213,9 @@
OrderCreateNewReturn=Cr\u00e9er un nouveau retour
OrderCreateOrder=Cr\u00e9ation de la commande
OrderCreateReturn=Cr\u00e9er un retour
+OrderCurrentStatus=Statut Actuel
OrderCustomerPo=R\u00e9f. Client
+OrderDate=Date Commande
OrderDateOrdered=Date Command\u00e9e
OrderDesiredDeliveryDate=D\u00e9lai de livraison souhait\u00e9
OrderDestination=Destination
@@ -215,16 +236,21 @@
OrderLookupOrder=Lancer recherche commande(s)
OrderLookupReturn=Lancer recherche retour(s)
OrderNoGiftWrap=Aucune Promotion
+OrderNoNotes=Aucune note pour cette commande.
OrderNoOrderFound=Aucune commande trouv\u00e9e
OrderNoOrderItemsToDisplay=Aucune ligne de commande \u00e0 afficher.
-OrderNoReturnFound=Aucun retour trouv\u00e9.
+OrderNote=Note
+OrderNotes=Notes
+OrderNotesCreateNew=Cr\u00e9er nouvelleOrderNoReturnFound=Aucun retour trouv\u00e9.
OrderNoReturnFoundWithId=Aucun retour trouv\u00e9 avec cette r\u00e9f\u00e9rence.
+OrderNotShipped=Non LivrŽ
OrderNotUsedForPurchase=Non utilis\u00e9 pour les commandes d'achat
OrderNotUsedForSales=Non utilis\u00e9 pour les commandes de vente
OrderOfflineCheckMoney=En diff\u00e9r\u00e9: V\u00e9rifiez le mandat
OrderOrder=Commande
OrderOrderConfirmation=Confirmation de la commande
OrderOrderDate=Date commande
+OrderOrdered=Command\u00e9e
OrderOrderEntry=Cr\u00e9ation
OrderOrderEntryCustomerInfo=Information sur le client
OrderOrderEntryPaymentSettings=Renseignements sur la facturation
@@ -252,6 +278,7 @@
OrderReceiveReturn=Recevoir un retour
OrderRemainingSubTotal=Sous-Total restant
OrderRequiredForSO=Obligatoire pour les commandes de vente
+OrderRemaining=Restante
OrderReturned=Retourn\u00e9
OrderReturnFound=Retour(s) trouv\u00e9(s)
OrderReturnFromAddress=Retour de l'addresse
@@ -265,11 +292,13 @@
OrderSelectPartyToOrder=S\u00e9lectionner le type d'acteur \u00e0 associer \u00e0 la commande
OrderSelectedGiftNotAvailableForAll=La promotion ne s'applique pas sur tous les articles. Ceux sur lesquels elle peut s'appliquer sont s\u00e9lectionn\u00e9s, les autres restent inchang\u00e9s.
OrderSendEmail=Envoi E-mail
+OrderShipGroup=Num\u00e9ro de lot
OrderShipmentInformation=Informations sur le moyen d'exp\u00e9dition
OrderSplittingPreference=Choix de livraison
OrderStartDateTime=D\u00e9but (Date/Heure)
OrderStatusHistory=Evolution des statuts
OrderSubTotal=Sous Total
+OrderSurvey=Apercu
OrderThisOrderGift=Cette commande est une promotion
OrderThisOrderNotGift=Cette commande n'est pas une promotion
OrderTotalDue=Total D\u00fb
@@ -279,6 +308,7 @@
OrderUnitList=Unit\u00e9 / Liste
OrderUseDefaultComment=Utiliser par d\u00e9faut le commentaire pour les autres lignes
OrderUseDefaultDesiredDeliveryDate=Utiliser par d\u00e9faut la date de livraison souhait\u00e9 pour les autres lignes
+OrderViewEditDelivery=Affichage/Modification des options de colisage
OrderViewPermissionError=Vous n'avez pas la permission de voir cette page. ("ORDERMGR_VIEW" ou "ORDERMGR_ADMIN" est n\u00E9cessaire)
#OrderTrackingNumber=Tracking Number
Modified: trunk/components/order/webapp/ordermgr/entry/minicart.ftl
===================================================================
--- trunk/components/order/webapp/ordermgr/entry/minicart.ftl 2004-12-04 12:12:03 UTC (rev 4017)
+++ trunk/components/order/webapp/ordermgr/entry/minicart.ftl 2004-12-07 02:11:48 UTC (rev 4018)
@@ -21,10 +21,13 @@
*
*@author David E. Jones (jonesde at ofbiz.org)
*@author Andy Zeneski (jaz at ofbiz.org)
- *@version $Rev:$
- *@since 2.1
+ *@author Jean-Luc.Malet at nereide.biz (migration to uiLabelMap)
+ *@version $Rev: 3227 $
+ *@since 2.2
-->
+<#assign uiLabelMap = requestAttributes.uiLabelMap>
+
<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists>
<#assign currencyUomId = shoppingCart.getCurrency()>
<#if shoppingCart?has_content>
@@ -39,7 +42,7 @@
<table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
<tr>
<td valign=middle align=center>
- <div class='boxhead'><b>Order Summary</b></div>
+ <div class='boxhead'><b>${uiLabelMap.OrderOrderSummary}</b></div>
</td>
</tr>
</table>
@@ -54,8 +57,8 @@
<#if (shoppingCartSize > 0)>
<tr>
<td valign="bottom"><div class="tabletext"><b>#<b></div></td>
- <td valign="bottom"><div class="tabletext"><b>Item<b></div></td>
- <td valign="bottom"><div class="tabletext"><b>Subtotal<b></div></td>
+ <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.ProductItem}<b></div></td>
+ <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.OrderSubTotal}<b></div></td>
</tr>
<#list shoppingCart.items() as cartLine>
<tr>
@@ -72,12 +75,12 @@
</#list>
<tr>
<td colspan="3" align="right">
- <div class="tabletext"><b>Total: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=currencyUomId/></b></div>
+ <div class="tabletext"><b>${uiLabelMap.CommonTotal}: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=currencyUomId/></b></div>
</td>
</tr>
<#else>
<tr>
- <td nowrap colspan="3"><div class="tabletext">No order items selected.</div></td>
+ <td nowrap colspan="3"><div class="tabletext">${uiLabelMap.OrderNoOrderItemsSelected}</div></td>
</tr>
</#if>
</table>
Modified: trunk/components/order/webapp/ordermgr/order/findOrders.ftl
===================================================================
--- trunk/components/order/webapp/ordermgr/order/findOrders.ftl 2004-12-04 12:12:03 UTC (rev 4017)
+++ trunk/components/order/webapp/ordermgr/order/findOrders.ftl 2004-12-07 02:11:48 UTC (rev 4018)
@@ -96,7 +96,7 @@
<option value="${currentRole.roleTypeId}">${currentRole.description}</option>
<option value="${currentRole.roleTypeId}">---</option>
</#if>
- <option value="ANY">Any Role Type</option>
+ <option value="ANY">${uiLabelMap.CommonAnyRoleType}</option>
<#list roleTypes as roleType>
<option value="${roleType.roleTypeId}">${roleType.description}</option>
</#list>
@@ -122,7 +122,7 @@
<option value="${currentType.orderTypeId}">${currentType.description}</option>
<option value="${currentType.orderTypeId}">---</option>
</#if>
- <option value="ANY">Any Order Type</option>
+ <option value="ANY">${uiLabelMap.CommonAnyOrderType}</option>
<#list orderTypes as orderType>
<option value="${orderType.orderTypeId}">${orderType.description}</option>
</#list>
@@ -148,7 +148,7 @@
<option value="${currentProductStore.productStoreId}">${currentProductStore.storeName}</option>
<option value="${currentProductStore.productStoreId}">---</option>
</#if>
- <option value="ANY">Any Store</option>
+ <option value="ANY">${uiLabelMap.CommonAnyStore}</option>
<#list productStores as store>
<option value="${store.productStoreId}">${store.storeName}</option>
</#list>
@@ -164,7 +164,7 @@
<option value="${currentWebSite.webSiteId}">${currentWebSite.siteName}</option>
<option value="${currentWebSite.webSiteId}">---</option>
</#if>
- <option value="ANY">Any Web Site</option>
+ <option value="ANY">${uiLabelMap.CommonAnyWebSite}</option>
<#list webSites as webSite>
<option value="${webSite.webSiteId}">${webSite.siteName}</option>
</#list>
@@ -180,7 +180,7 @@
<option value="${currentStatus.statusId}">${currentStatus.description}</option>
<option value="${currentStatus.statusId}">---</option>
</#if>
- <option value="ANY">Any Order Status</option>
+ <option value="ANY">${uiLabelMap.CommonAnyOrderStatus}</option>
<#list orderStatuses as orderStatus>
<option value="${orderStatus.statusId}">${orderStatus.description}</option>
</#list>
@@ -274,7 +274,7 @@
<td width="5%" align="left"><div class="tableheadtext">${uiLabelMap.OrderOrderType}</div></td>
<td width="5%" align="left"><div class="tableheadtext">${uiLabelMap.OrderOrderId}</div></td>
<td width="20%" align="left"><div class="tableheadtext">${uiLabelMap.PartyUserLoginId}</div></td>
- <td width="5%" align="right"><div class="tableheadtext">Survey</div></td>
+ <td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderSurvey}</div></td>
<td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderItemsOrdered}</div></td>
<td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderItemsReturned}</div></td>
<td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderRemainingSubTotal}</div></td>
Modified: trunk/components/order/webapp/ordermgr/order/newnote.ftl
===================================================================
--- trunk/components/order/webapp/ordermgr/order/newnote.ftl 2004-12-04 12:12:03 UTC (rev 4017)
+++ trunk/components/order/webapp/ordermgr/order/newnote.ftl 2004-12-07 02:11:48 UTC (rev 4018)
@@ -20,21 +20,25 @@
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*@author Andy Zeneski (jaz at ofbiz.org)
- *@version $Rev:$
+ *@author Jean-Luc.Malet at nereide.biz (migration to uiLabelMap)
+ *@version $Rev: 3227 $
*@since 2.2
-->
+<#assign uiLabelMap = requestAttributes.uiLabelMap>
+
+
<#if security.hasEntityPermission("ORDERMGR", "_VIEW", session)>
- <p class="head1">Add Note</p>
+ <p class="head1">${uiLabelMap.OrderAddNote}</p>
- <a href="<@ofbizUrl>/authview/${donePage}</@ofbizUrl>" class="buttontext">[Go Back]</a>
- <a href="javascript:document.createnoteform.submit()" class="buttontext">[Save]</a>
+ <a href="<@ofbizUrl>/authview/${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a>
+ <a href="javascript:document.createnoteform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a>
<form method="post" action="<@ofbizUrl>/createordernote/${donePage}</@ofbizUrl>" name="createnoteform">
<input type="hidden" name="orderId" value="${orderId?if_exists}">
<table width="90%" border="0" cellpadding="2" cellspacing="0">
<tr>
- <td width="26%" align=right><div class="tabletext">Note</div></td>
+ <td width="26%" align=right><div class="tabletext">${uiLabelMap.OrderNote}</div></td>
<td width="54%">
<textarea name="note" class="textAreaBox" rows="5" cols="70"></textarea>
</td>
@@ -43,9 +47,9 @@
</table>
</form>
- <a href="<@ofbizUrl>/authview/${donePage}</@ofbizUrl>" class="buttontext">[Go Back]</a>
- <a href="javascript:document.createnoteform.submit()" class="buttontext">[Save]</a>
+ <a href="<@ofbizUrl>/authview/${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a>
+ <a href="javascript:document.createnoteform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a>
<#else>
- <h3>You do not have permission to view this page. ("ORDERMGR_VIEW" or "ORDERMGR_ADMIN" needed)</h3>
+ <h3>${uiLabelMap.OrderViewPermissionError}</h3>
</#if>
Modified: trunk/components/order/webapp/ordermgr/order/orderheader.ftl
===================================================================
--- trunk/components/order/webapp/ordermgr/order/orderheader.ftl 2004-12-04 12:12:03 UTC (rev 4017)
+++ trunk/components/order/webapp/ordermgr/order/orderheader.ftl 2004-12-07 02:11:48 UTC (rev 4018)
@@ -589,7 +589,7 @@
<#if shipGroup.contactMechId?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>Address</b></div>
+ <div class="tabletext"> <b>${uiLabelMap.OrderAddress}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
@@ -668,7 +668,7 @@
<#if shipGroup.maySplit?upper_case == "N">
${uiLabelMap.FacilityWaitEntireOrderReady}
<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
- <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED"><a href="<@ofbizUrl>/allowordersplit?orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&${paramString}</@ofbizUrl>" class="buttontext">[Allow Split]</a></#if>
+ <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED"><a href="<@ofbizUrl>/allowordersplit?orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&${paramString}</@ofbizUrl>" class="buttontext">[${uiLabelMap.OrderAllowSplit}]</a></#if>
</#if>
<#else>
${uiLabelMap.FacilityShipAvailable}
@@ -760,6 +760,7 @@
</#if>
<#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED">
<div class="tabletext"><a href="<@ofbizUrl>/OrderDeliveryScheduleInfo?orderId=${orderId}</@ofbizUrl>" class="buttontext">View/Edit Delivery Schedule Info</a></div>
+ <div class="tabletext"><a href="<@ofbizUrl>/OrderDeliveryScheduleInfo?orderId=${orderId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewEditDelivery}</a></div>
</#if>
<#if security.hasEntityPermission("ORDERMGR", "_RETURN", session) && orderHeader.statusId == "ORDER_COMPLETED">
<div><a href="<@ofbizUrl>/quickRefundOrder?order_id=${orderId}&orderId=${orderId}&receiveReturn=true</@ofbizUrl>" class="buttontext">Quick-Refund Entire Order</a></div>
Modified: trunk/components/order/webapp/ordermgr/order/orderitems.ftl
===================================================================
--- trunk/components/order/webapp/ordermgr/order/orderitems.ftl 2004-12-04 12:12:03 UTC (rev 4017)
+++ trunk/components/order/webapp/ordermgr/order/orderitems.ftl 2004-12-07 02:11:48 UTC (rev 4018)
@@ -117,9 +117,9 @@
</td>
<td align="right" valign="top" nowrap>
<#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))>
- <div class="tabletext">Ordered: ${orderItem.quantity?default(0)?string.number} </div>
- <div class="tabletext">Cancelled: ${orderItem.cancelQuantity?default(0)?string.number} </div>
- <div class="tabletext">Remaining: ${remainingQuantity?string.number} </div>
+ <div class="tabletext">${uiLabelMap.OrderOrdered}: ${orderItem.quantity?default(0)?string.number} </div>
+ <div class="tabletext">${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} </div>
+ <div class="tabletext">${uiLabelMap.OrderRemaining}:
</td>
<td align="right" valign="top" nowrap>
<div class="tabletext" nowrap><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/> / <@ofbizCurrency amount=orderItem.unitListPrice isoCode=currencyUomId/></div>
@@ -137,7 +137,7 @@
<td> </td>
<td align="right" valign="top" nowrap>
<#if (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")>
- <div class="tabletext"><a href="<@ofbizUrl>/cancelOrderItem?order_id=${orderItem.orderId}&item_seq=${orderItem.orderItemSeqId}&${paramString}</@ofbizUrl>" class="buttontext">[Cancel All]</a></div>
+ <div class="tabletext"><a href="<@ofbizUrl>/cancelOrderItem?order_id=${orderItem.orderId}&item_seq=${orderItem.orderItemSeqId}&${paramString}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCancelAll}]</a></div>
<#else>
</#if>
@@ -215,7 +215,7 @@
<#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists>
<tr>
<td align="right" colspan="2">
- <div class="tabletext" style="font-size: xx-small;"><b><i>Ship Group</i>:</b> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("Not Shipped")}</div>
+ <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.OrderShipGroup}</i>:</b> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")}</div>
</td>
<td align="center">
<div class="tabletext" style="font-size: xx-small;">${shipGroupAssoc.quantity?string.number} </div>
@@ -227,7 +227,7 @@
<td align="right" valign="top" nowrap>
<#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)))>
<#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")>
- <div class="tabletext"><a href="<@ofbizUrl>/cancelOrderItem?order_id=${orderItem.orderId}&item_seq=${orderItem.orderItemSeqId}&group_seq=${shipGroup.shipGroupSeqId}&${paramString}</@ofbizUrl>" class="buttontext">[Cancel]</a></div>
+ <div class="tabletext"><a href="<@ofbizUrl>/cancelOrderItem?order_id=${orderItem.orderId}&item_seq=${orderItem.orderItemSeqId}&group_seq=${shipGroup.shipGroupSeqId}&${paramString}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCancel}]</a></div>
<#else>
</#if>
@@ -245,7 +245,7 @@
<div class="tabletext" style="font-size: xx-small;">
<b><i>${uiLabelMap.FacilityInventory}</i>:</b>
<a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderItemShipGrpInvRes.inventoryItemId}</a>
- <b><i>Ship Group</i>:</b> ${orderItemShipGrpInvRes.shipGroupSeqId}
+ <b><i>${uiLabelMap.OrderShipGroup}</i>:</b> ${orderItemShipGrpInvRes.shipGroupSeqId}
</div>
</td>
<td align="center">
@@ -356,7 +356,7 @@
<input type="text" name="amount" size="6" value="0.00" class="inputBox">
</td>
<td align="right" colspan="2">
- <a href="javascript:document.addAdjustmentForm.submit();" class="buttontext">[Add]</a>
+ <a href="javascript:document.addAdjustmentForm.submit();" class="buttontext">[${uiLabelMap.CommonAdd}]</a>
</td>
</form>
</tr>
Modified: trunk/components/order/webapp/ordermgr/order/ordernotes.ftl
===================================================================
--- trunk/components/order/webapp/ordermgr/order/ordernotes.ftl 2004-12-04 12:12:03 UTC (rev 4017)
+++ trunk/components/order/webapp/ordermgr/order/ordernotes.ftl 2004-12-07 02:11:48 UTC (rev 4018)
@@ -20,10 +20,13 @@
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*@author Andy Zeneski (jaz at ofbiz.org)
- *@version $Rev:$
+ *@author Jean-Luc.Malet at nereide.biz (migration to uiLabelMap)
+ *@version $Rev: 3227 $
*@since 2.2
-->
+<#assign uiLabelMap = requestAttributes.uiLabelMap>
+
<#assign delegator = requestAttributes.delegator>
<table border=0 width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
<tr>
@@ -31,11 +34,11 @@
<table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
<tr>
<td valign="middle" align="left">
- <div class="boxhead"> Notes</div>
+ <div class="boxhead"> ${uiLabelMap.OrderNotes}</div>
</td>
<td valign="middle" align="right">
<#if security.hasEntityPermission("ORDERMGR", "_NOTE", session)>
- <a href="<@ofbizUrl>/createnewnote?${paramString}</@ofbizUrl>" class="submenutextright">Create New</a>
+ <a href="<@ofbizUrl>/createnewnote?${paramString}</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderNotesCreateNew}</a>
</#if>
</td>
</tr>
@@ -52,8 +55,8 @@
<#list orderNotes as note>
<tr>
<td align="left" valign="top" width="35%">
- <div class="tabletext"> <b>By: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div>
- <div class="tabletext"> <b>At: </b>${note.noteDateTime?string?if_exists}</div>
+ <div class="tabletext"> <b>${uiLabelMap.CommonBy}: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div>
+ <div class="tabletext"> <b>${uiLabelMap.CommonAt}: </b>${note.noteDateTime?string?if_exists}</div>
</td>
<td align="left" valign="top" width="65%">
<div class="tabletext">${note.noteInfo?if_exists}</div>
@@ -65,7 +68,7 @@
</#list>
</table>
<#else>
- <div class="tabletext"> No notes for this order.</div>
+ <div class="tabletext"> ${uiLabelMap.OrderNoNotes}.</div>
</#if>
</td>
</tr>
More information about the Svn
mailing list