OFBiz › OFBiz - Commits

svn commit: r659052 [3/3] - in /ofbiz/trunk: applications/ecommerce/config/ applications/ecommerce/webapp/ecommerce/order/ applications/ecommerce/webapp/ecommerce/quote/ applications/ecommerce/webapp/ecommerce/request/ applications/order/config/ applic...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r659052 [3/3] - in /ofbiz/trunk: applications/ecommerce/config/ applications/ecommerce/webapp/ecommerce/order/ applications/ecommerce/webapp/ecommerce/quote/ applications/ecommerce/webapp/ecommerce/request/ applications/order/config/ applic...

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl Thu May 22 02:02:28 2008
@@ -34,7 +34,7 @@
<table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2">
- <h1>${uiLabelMap.OrderShipGroup} # ${currIndex}<#if supplier?has_content> - ${uiLabelMap.OrderDropShipped} - ${supplier.groupName?default(supplier.partyId)}</#if></h1>
+ <h1>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}<#if supplier?has_content> - ${uiLabelMap.OrderDropShipped} - ${supplier.groupName?default(supplier.partyId)}</#if></h1>
</td>
</tr>
<tr>
@@ -79,7 +79,7 @@
<option value="${shipGroupIndex}">---</option>
<#list 0..(shoppingCart.getShipGroupSize() - 1) as groupIdx>
<#assign groupNumber = groupIdx + 1>
- <option value="${groupIdx}">${uiLabelMap.CommonGroup} # ${groupNumber}</option>
+ <option value="${groupIdx}">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonNbr} ${groupNumber}</option>
</#list>
</select>
</div>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl Thu May 22 02:02:28 2008
@@ -39,7 +39,7 @@
<table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2">
- <h1><b>${uiLabelMap.OrderShipGroup} # ${currIndex}</b><#if supplier?has_content> - ${supplier.groupName?default(supplier.partyId)}</#if></h1>
+ <h1><b>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</b><#if supplier?has_content> - ${supplier.groupName?default(supplier.partyId)}</#if></h1>
</td>
</tr>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Thu May 22 02:02:28 2008
@@ -34,7 +34,7 @@
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<tr>
<td colspan="4">
- <h1>${uiLabelMap.OrderShipGroup} # ${currIndex}</h1>
+ <h1>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</h1>
</td>
</tr>
<#assign i = 0>
@@ -121,7 +121,7 @@
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<tr>
<td colspan="3">
- <h1>${uiLabelMap.OrderShipGroup} # ${currIndex}</h1>
+ <h1>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</h1>
</td>
</tr>
<tr>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Thu May 22 02:02:28 2008
@@ -382,7 +382,7 @@
<td width="1%"> </td>
<td align="left" valign="top" width="60%">
<#list invoices as invoice>
- <div>${uiLabelMap.OrderNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}&externalLoginKey=${externalLoginKey}" class="buttontext">${invoice}</a>
+ <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}&externalLoginKey=${externalLoginKey}" class="buttontext">${invoice}</a>
(<a href="/accounting/control/invoice.pdf?invoiceId=${invoice}" class="buttontext">PDF</a>)</div>
</#list>
</td>

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=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Thu May 22 02:02:28 2008
@@ -251,7 +251,7 @@
<td width="5"> </td>
<td align="left" valign="top" width="80%">
<#list shipGroupShipments as shipment>
- <div>${uiLabelMap.OrderNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipment.shipmentId}</a>  <a href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a></div>
+ <div>${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipment.shipmentId}</a>  <a href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a></div>
</#list>
</td>
</tr>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu May 22 02:02:28 2008
@@ -600,7 +600,7 @@
</property>
<property key="FormFieldTitle_autoOrderCcTryExp">
<value xml:lang="en">Auto Order Cc Try Exp</value>
- <value xml:lang="fr">Ordres automatiques : essayer d'autres dates d'expiration de carte de crÃ©dit ? </value>
+ <value xml:lang="fr">Commandes automatiques : essayer d'autres dates d'expiration de carte de crÃ©dit ? </value>
<value xml:lang="it">Ordine Automatico Cc Tentativo Scadenza</value>
<value xml:lang="ro">Comanda Automatica Cc Tentativa Expirata</value>
<value xml:lang="ru">ÐÐ²ÑÐ¾Ð·Ð°ÐºÐ°Ð· ÐºÑ.ÐºÐ°ÑÑ. Ð¿ÑÐ¾Ð±. ÑÐ°ÑÑ.</value>
@@ -609,7 +609,7 @@
</property>
<property key="FormFieldTitle_autoOrderCcTryLaterMax">
<value xml:lang="en">Auto Order Cc Try Later Max</value>
- <value xml:lang="fr">Ordres automatiques : s'il n'y a pas assez de fonds rÃ©essayer combien de fois ?</value>
+ <value xml:lang="fr">Commandes automatiques : s'il n'y a pas assez de fonds rÃ©essayer combien de fois ?</value>
<value xml:lang="it">Ordine Automatico Cc Riprovare Successivamente Massimo</value>
<value xml:lang="ro">Comanda Automatica Cc Incearca mai tarziu Maxim</value>
<value xml:lang="ru">ÐÐ²ÑÐ¾Ð·Ð°ÐºÐ°Ð· ÐºÑ.ÐºÐ°ÑÑ. Ð¿ÑÐ¾Ð±. Ð¿Ð¾Ð·Ð¶Ðµ Ð¼Ð°Ðº.</value>
@@ -618,7 +618,7 @@
</property>
<property key="FormFieldTitle_autoOrderCcTryLaterNsf">
<value xml:lang="en">Auto Order Cc Try Later Nsf</value>
- <value xml:lang="fr">Ordres automatiques : s'il n'y a pas assez de fonds rÃ©essayer plus tard ?</value>
+ <value xml:lang="fr">Commandes automatiques : s'il n'y a pas assez de fonds rÃ©essayer plus tard ?</value>
<value xml:lang="it">Ordine Automatico Cc Riprovare Successivamente Nsf</value>
<value xml:lang="ro">Comanda Automatica Cc Incearca mai tarziu Nsf</value>
<value xml:lang="ru">ÐÐ²ÑÐ¾Ð·Ð°ÐºÐ°Ð· ÐºÑ.ÐºÐ°ÑÑ. Ð¿ÑÐ¾Ð±. Ð¿Ð¾Ð·Ð¶Ðµ Nsf</value>
@@ -627,7 +627,7 @@
</property>
<property key="FormFieldTitle_autoOrderCcTryOtherCards">
<value xml:lang="en">Auto Order Cc Try Other Cards</value>
- <value xml:lang="fr">Ordres automatiques : essayer d'autres carte de crÃ©dit du client ?</value>
+ <value xml:lang="fr">Commandes automatiques : essayer d'autres carte de crÃ©dit du client ?</value>
<value xml:lang="it">Ordine Automatico Cc Tentativo Altre Carte</value>
<value xml:lang="ro">Comanda Automatica Cc Tentativa Alta Carte</value>
<value xml:lang="ru">ÐÐ²ÑÐ¾Ð·Ð°ÐºÐ°Ð· ÐºÑ.ÐºÐ°ÑÑ. Ð¿ÑÐ¾Ð±. Ð´ÑÑÐ³Ð¸Ðµ ÐºÐ°ÑÑÑ</value>
@@ -3828,7 +3828,7 @@
<property key="PageTitleAddItemsFromOrder">
<value xml:lang="en">Add Items From Order</value>
<value xml:lang="es">AÃ±adir artÃculos de una Orden</value>
- <value xml:lang="fr">Ajouter une ligne Ã partir de l'ordre</value>
+ <value xml:lang="fr">Ajouter une ligne Ã partir de la commande</value>
<value xml:lang="it">Aggiungi Righe Dall'Ordine</value>
<value xml:lang="ro">Adauga Linii Din Comanda</value>
<value xml:lang="ru">ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð¿Ð¾Ð·Ð¸ÑÐ¸Ð¸ Ð² Ð·Ð°ÐºÐ°Ð·</value>
@@ -9727,7 +9727,7 @@
<property key="ProductFromOrder">
<value xml:lang="en">Product from order</value>
<value xml:lang="es">Producto de una orden</value>
- <value xml:lang="fr">Depuis l'ordre de commande</value>
+ <value xml:lang="fr">Article depuis la commande</value>
<value xml:lang="it">Prodotto su ordine</value>
<value xml:lang="ro">Produs pe comanda</value>
<value xml:lang="ru">ÐÑÐ¾Ð´ÑÐºÑ Ð¸Ð· Ð·Ð°ÐºÐ°Ð·Ð°</value>
@@ -12403,7 +12403,7 @@
<property key="ProductNoteOrderStatus">
<value xml:lang="en">NOTE: Order Status is</value>
<value xml:lang="es">NOTA: El estado de la orden es</value>
- <value xml:lang="fr">NOTE: le statut de l'ordre est</value>
+ <value xml:lang="fr">NOTE: le statut de la commande est</value>
<value xml:lang="it">NOTA: Stato Ordine Ã¨</value>
<value xml:lang="ro">NOTA: Starea Comenzii este </value>
<value xml:lang="ru">ÐÐ ÐÐÐÐ§ÐÐÐÐ: Ð¡ÑÐ°ÑÑÑ Ð·Ð°ÐºÐ°Ð·Ð°</value>
@@ -12413,7 +12413,7 @@
<property key="ProductNoteOrderType">
<value xml:lang="en">NOTE: Order Type is</value>
<value xml:lang="es">NOTA: El tipo de orden es</value>
- <value xml:lang="fr">NOTE: le type de l'ordre est</value>
+ <value xml:lang="fr">NOTE: le type de la commande est</value>
<value xml:lang="it">NOTA: Tipo Ordine Ã¨</value>
<value xml:lang="ro">NOTA: Tipul Comenzii este</value>
<value xml:lang="ru">ÐÐ ÐÐÐÐ§ÐÐÐÐ: Ð¢Ð¸Ð¿ Ð·Ð°ÐºÐ°Ð·Ð°</value>
@@ -13236,7 +13236,7 @@
<property key="ProductPo">
<value xml:lang="en">PO</value>
<value xml:lang="es">PO</value>
- <value xml:lang="fr">CA</value>
+ <value xml:lang="fr">Cmd d'achat</value>
<value xml:lang="it">OA</value>
<value xml:lang="ro">OA</value>
<value xml:lang="ru">ÐÐ</value>
@@ -13245,7 +13245,7 @@
</property>
<property key="ProductPopularityByOrders">
<value xml:lang="en">Popularity by Orders</value>
- <value xml:lang="fr">PopularitÃ© d'aprÃ¨s les commandes</value>
+ <value xml:lang="fr">PopularitÃ© par commandes</value>
<value xml:lang="it">PopularitÃ per Ordine</value>
<value xml:lang="ro">Popularitate Comanda</value>
<value xml:lang="ru">ÐÐ¾Ð¿ÑÐ»ÑÑÐ½Ð¾ÑÑÑ Ð¿Ð¾ Ð·Ð°ÐºÐ°Ð·Ð°Ð¼</value>
@@ -13254,7 +13254,7 @@
</property>
<property key="ProductPopularityByViews">
<value xml:lang="en">Popularity by Views</value>
- <value xml:lang="fr">PopularitÃ© d'aprÃ¨s les visites</value>
+ <value xml:lang="fr">PopularitÃ© par visites</value>
<value xml:lang="it">PopularitÃ per Visita</value>
<value xml:lang="ro">Popularitate Vizualizare</value>
<value xml:lang="ru">ÐÐ¾Ð¿ÑÐ»ÑÑÐ½Ð¾ÑÑÑ Ð¿Ð¾ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ°Ð¼</value>
@@ -14520,7 +14520,7 @@
<property key="ProductReceiptPurchaseOrder">
<value xml:lang="en">Receipt(s) For Purchase Order</value>
<value xml:lang="es">Recibo(s) por orden de compra</value>
- <value xml:lang="fr">Ordre(s) d'achat reÃ§u(s)</value>
+ <value xml:lang="fr">ReÃ§u(s) pour la commande d'achat</value>
<value xml:lang="it">Ricevuta(e) Per Ordine Acquisto</value>
<value xml:lang="ro">Chitanta(e) Pe Comanda de Cumparare </value>
<value xml:lang="ru">ÐÐ¾Ð»ÑÑÐµÐ½(Ñ) Ð´Ð»Ñ Ð·Ð°ÐºÑÐ¿Ð¾ÑÐ½Ð¾Ð³Ð¾ Ð·Ð°ÐºÐ°Ð·Ð°</value>
@@ -14546,14 +14546,14 @@
</property>
<property key="ProductReceiveInventoryAgainstPO">
<value xml:lang="en">Receive Against PO</value>
- <value xml:lang="fr">Recevoir contre ordre d'achat</value>
+ <value xml:lang="fr">Recevoir contre la commande d'achat</value>
<value xml:lang="it">Ricevi a fronte di un Ordine di Acquisto</value>
<value xml:lang="ru">ÐÐ¾Ð»ÑÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ ÐÐ</value>
<value xml:lang="th">à¹à¸à¹à¸£à¸±à¸à¸à¸²à¸£à¹à¸à¸£à¸µà¸¢à¸à¹à¸à¸µà¸¢à¸à¸à¸±à¸ PO</value>
</property>
<property key="ProductReceiveInventoryAgainstPurchaseOrder">
<value xml:lang="en">Receive Inventory Against Purchase Order</value>
- <value xml:lang="fr">Recevoir en stock contre ordre d'achat</value>
+ <value xml:lang="fr">Recevoir en stock contre la commande d'achat</value>
<value xml:lang="it">Ricevi Inventario a fronte di un Ordine di Acquisto</value>
<value xml:lang="ru">ÐÐ¾Ð»ÑÑÐµÐ½Ð¸Ðµ Ð¢ÐÐ¦ Ð´Ð»Ñ Ð·Ð°ÐºÑÐ¿Ð¾ÑÐ½Ð¾Ð³Ð¾ Ð·Ð°ÐºÐ°Ð·Ð°</value>
<value xml:lang="th">à¹à¸à¹à¸£à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸à¹à¸«à¸¥à¸·à¸à¹à¸à¸£à¸µà¸¢à¸à¹à¸à¸µà¸¢à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸
@@ -14561,7 +14561,7 @@
</property>
<property key="ProductReceiveInventoryAgainstPurchaseOrderProductNotFound">
<value xml:lang="en">Product ${productId} not found in order ${orderId}</value>
- <value xml:lang="fr">Produit ${productId) non trouvÃ© dans l'ordre ${orderId}</value>
+ <value xml:lang="fr">Produit ${productId) non trouvÃ© dans la commande ${orderId}</value>
<value xml:lang="it">Prodotto ${productId} non trovato per l'ordine ${orderId}</value>
<value xml:lang="ru">ÐÑÐ¾Ð´ÑÐºÑ ${productId} Ð² Ð·Ð°ÐºÐ°Ð·Ðµ ${orderId} Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½</value>
<value xml:lang="th">à¸ªà¸´à¸à¸à¹à¸² ${productId} à¹à¸¡à¹à¸à¸à¹à¸à¸£à¸²à¸¢à¸à¸²à¸£ ${orderId}</value>
@@ -14603,7 +14603,7 @@
<property key="ProductReceivePurchaseOrder">
<value xml:lang="en">Receive Purchase Order</value>
<value xml:lang="es">Recibir orden de compra</value>
- <value xml:lang="fr">RÃ©ception liÃ© Ã l'ordre d'achat nÂ°</value>
+ <value xml:lang="fr">RÃ©ception liÃ© Ã la commande d'achat nÂ°</value>
<value xml:lang="it">Ricevi Ordine Acquisto</value>
<value xml:lang="ro">Intrare pe Comanda de Cumparare</value>
<value xml:lang="ru">ÐÐ¾Ð»ÑÑÐµÐ½Ð¸Ðµ Ð·Ð°ÐºÑÐ¿Ð¾ÑÐ½Ð¾Ð³Ð¾ Ð·Ð°ÐºÐ°Ð·Ð°</value>
@@ -15500,7 +15500,7 @@
<property key="ProductSeqId">
<value xml:lang="en">Seq Id</value>
<value xml:lang="es">CÃ³digo de secuencia</value>
- <value xml:lang="fr">RÃ©f. de l'ordre</value>
+ <value xml:lang="fr">RÃ©f. sÃ©q.</value>
<value xml:lang="it">Codice Seq</value>
<value xml:lang="ro">Cod Secventa</value>
<value xml:lang="ru">ÐÐ</value>
@@ -15656,7 +15656,7 @@
<property key="ProductSettingsFromPrimaryOrder">
<value xml:lang="en">Get Settings From Primary Order</value>
<value xml:lang="es">Obtener parÃ¡metros de orden primaria</value>
- <value xml:lang="fr">Prendre les configurations Ã partir de l'ordre principal</value>
+ <value xml:lang="fr">Prendre les configurations Ã partir de la commande principal</value>
<value xml:lang="it">Prendi Impostazioni Dall'Ordine Primario</value>
<value xml:lang="ro">Foloseste Setarile de la Comanda Primara</value>
<value xml:lang="ru">ÐÐ¾Ð»ÑÑÐ¸ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¸Ð· Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð·Ð°ÐºÐ°Ð·Ð°</value>
@@ -17181,14 +17181,14 @@
</property>
<property key="ProductUpdateCategoryContentAssoc">
<value xml:lang="en">Update Category Content Assoc</value>
- <value xml:lang="fr">Mettre Ã jour l'association contenu catÃ©gorie</value>
+ <value xml:lang="fr">Mettre Ã jour l'association contenu/catÃ©gorie</value>
<value xml:lang="it">Aggiorna Associazione Contenuti Categoria</value>
<value xml:lang="th">à¸à¸±à¸à¹à¸à¸à¸à¸¥à¸¸à¹à¸¡à¸«à¸±à¸§à¸à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value>
</property>
<property key="ProductUpdateDownloadContentProduct">
<value xml:lang="en">Update Download Content for Product</value>
<value xml:lang="es">Actualizar Centro de descarga para producto</value>
- <value xml:lang="fr">Mettre Ã jour le tÃ©lÃ©chargement du contenu de l'article</value>
+ <value xml:lang="fr">Mettre Ã jour le contenu de tÃ©lÃ©chargement de l'article</value>
<value xml:lang="it">Aggiorna Conutenuto Download per Prodotto</value>
<value xml:lang="ro">Actualizeaza Continutul Download pentru Produs</value>
<value xml:lang="ru">ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð½ÑÐµÐ½Ñ Ð´Ð»Ñ Ð¿ÑÐ¾Ð´ÑÐºÑÐ°</value>
@@ -17198,7 +17198,7 @@
<property key="ProductUpdateEmailContentProduct">
<value xml:lang="en">Update Email Content for Product</value>
<value xml:lang="es">Actualizar Contenido de email para producto</value>
- <value xml:lang="fr">Mettre Ã jour l'email de contenu de l'article</value>
+ <value xml:lang="fr">Mettre Ã jour le contenu de l'email de l'article</value>
<value xml:lang="it">Aggiorna Conutenuto Email per Prodotto</value>
<value xml:lang="ro">Actualizeaza Continutul Email pentru Produs</value>
<value xml:lang="ru">ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ Ð´Ð»Ñ Ð¿ÑÐ¾Ð´ÑÐºÑÐ° ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ ÐºÐ¾Ð½ÑÐµÐ½Ñ Ð¿Ð¾ ÑÐ». Ð¿Ð¾ÑÑÐµ</value>
@@ -17247,7 +17247,7 @@
<property key="ProductUpdateSimpleTextContentProduct">
<value xml:lang="en">Update Simple Text Content for Product</value>
<value xml:lang="es">Actualizar Contenido de texto simple para Producto</value>
- <value xml:lang="fr">Mise Ã jour du texte du contenu de l'article</value>
+ <value xml:lang="fr">Mise Ã jour du contenu du texte de l'article</value>
<value xml:lang="it">Aggiorna Conutenuto Testo per Prodotto</value>
<value xml:lang="ro">Actualizeaza Conutinutul Text pe Produs</value>
<value xml:lang="ru">ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ Ð´Ð»Ñ Ð¿ÑÐ¾Ð´ÑÐºÑÐ° ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ Ð¿ÑÐ¾ÑÑÐ¾Ð¹ ÑÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÐºÐ¾Ð½ÑÐµÐ½Ñ</value>
@@ -17384,7 +17384,7 @@
<property key="ProductUsedForDisplayOrdering">
<value xml:lang="en">Used For Display Ordering</value>
<value xml:lang="es">Usado para mostrar la orden</value>
- <value xml:lang="fr">Montrer l'ordre</value>
+ <value xml:lang="fr">UtilisÃ© pour montrer l'ordre</value>
<value xml:lang="it">Usato per Ordinamento Visualizzazione</value>
<value xml:lang="ro">Foloseste Vizualizare Ordonata </value>
<value xml:lang="ru">ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° Ð·Ð°ÐºÐ°Ð·Ð¾Ð²</value>
@@ -17541,7 +17541,7 @@
<property key="ProductWarningOrderStatus">
<value xml:lang="en">WARNING: Order Status is</value>
<value xml:lang="es">ADVERTENCIA: Estado de la orden es</value>
- <value xml:lang="fr">Attention : le statut de l'ordre est</value>
+ <value xml:lang="fr">Attention : le statut de la commande est</value>
<value xml:lang="it">ATTENZIONE: Stato Ordine Ã¨</value>
<value xml:lang="ro">ATENTIE: Starea comenzii e</value>
<value xml:lang="ru">ÐÐ ÐÐÐ£ÐÐ ÐÐÐÐÐÐÐ: Ð¡ÑÐ°ÑÑÑ Ð·Ð°ÐºÐ°Ð·Ð°</value>

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Thu May 22 02:02:28 2008
@@ -39,15 +39,15 @@

<#-- Receiving Results -->
<#if receivedItems?has_content>
- <h3>${uiLabelMap.ProductReceiptPurchaseOrder} #${purchaseOrder.orderId}</h3>
+ <h3>${uiLabelMap.ProductReceiptPurchaseOrder} ${purchaseOrder.orderId}</h3>
<hr/>
<table class="basic-table" cellspacing="0">
<tr class="header-row">
- <td>${uiLabelMap.ProductShipmentId}#</td>
- <td>${uiLabelMap.ProductReceipt}#</td>
+ <td>${uiLabelMap.ProductShipmentId}</td>
+ <td>${uiLabelMap.ProductReceipt}</td>
<td>${uiLabelMap.CommonDate}</td>
- <td>${uiLabelMap.ProductPo} #</td>
- <td>${uiLabelMap.ProductLine} #</td>
+ <td>${uiLabelMap.ProductPo}</td>
+ <td>${uiLabelMap.ProductLine}</td>
<td>${uiLabelMap.ProductProductId}</td>
<td>${uiLabelMap.ProductPerUnitPrice}</td>
<td>${uiLabelMap.CommonRejected}</td>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Thu May 22 02:02:28 2008
@@ -3754,10 +3754,23 @@
<value xml:lang="zh_CN">ç°å¨</value>
<value xml:lang="zh">ç°å¨</value>
</property>
+ <property key="CommonNbr">
+ <value xml:lang="en">Nbr</value>
+ <value xml:lang="es">#</value>
+ <value xml:lang="fr">NÂ°</value>
+ <value xml:lang="it">#</value>
+ <value xml:lang="ja">#</value>
+ <value xml:lang="nl">#</value>
+ <value xml:lang="ro">#</value>
+ <value xml:lang="ru">â</value>
+ <value xml:lang="th">à¸à¸³à¸à¸§à¸</value>
+ <value xml:lang="zh">#</value>
+ </property>
<property key="CommonNumber">
<value xml:lang="en">Number</value>
+ <value xml:lang="fr">NÂ°</value>
<value xml:lang="th">à¸«à¸¡à¸²à¸¢à¹à¸¥à¸</value>
- </property>
+ </property>
<property key="CommonOctober">
<value xml:lang="ar">Ø£ÙØªÙØ¨Ø±</value>
<value xml:lang="de">Oktober</value>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Thu May 22 02:02:28 2008
@@ -86,7 +86,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="${uiLabelMap.PageTitleTimesheet} # ${timesheet.timesheetId} week: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"/>
+ <label text="${uiLabelMap.PageTitleTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} week: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"/>
</container>
</container>
<container style="screenlet-body">
@@ -138,7 +138,7 @@
<section>
<widgets>
<container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditTimesheet} # ${timesheet.timesheetId}</label></container>
+ <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId}</label></container>
<container style="screenlet-body">
<include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
</container>
@@ -196,7 +196,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="${uiLabelMap.PageTitleCurrentTimesheet} # ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"/>
+ <label text="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"/>
</container>
</container>
<container style="screenlet-body">