svn commit: r1061848 - in /ofbiz/trunk: applications/order/webapp/ordermgr/order/orderitems.ftl applications/product/config/ProductUiLabels.xml framework/common/config/CommonUiLabels.xml

[jleroux]

Author: jleroux
Date: Fri Jan 21 15:29:40 2011
New Revision: 1061848

URL: http://svn.apache.org/viewvc?rev=1061848&view=rev
Log:
Merge CommonInventory and FacilityInventory labels and use only CommonInventory

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1061848&r1=1061847&r2=1061848&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Fri Jan 
21 15:29:40 2011
@@ -516,7 +516,7 @@ under the License.
                             <#list orderItemShipGrpInvResList as 
orderItemShipGrpInvRes>
                                 <tr<#if itemClass == "1"> 
class="alternate-row"</#if>>
                                     <td align="right" colspan="2">
-                                        <span 
class="label">${uiLabelMap.FacilityInventory}</span>&nbsp;
+                                        <span 
class="label">${uiLabelMap.CommonInventory}</span>&nbsp;
                                         <a 
href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}&amp;externalLoginKey=${externalLoginKey}"
                                            
class="buttontext">${orderItemShipGrpInvRes.inventoryItemId}</a>
                                         <span 
class="label">${uiLabelMap.OrderShipGroup}</span>&nbsp;${orderItemShipGrpInvRes.shipGroupSeqId}
@@ -584,7 +584,7 @@ under the License.
                                     <td align="right" colspan="2">
                                         <#if 
itemIssuance.inventoryItemId?has_content>
                                             <#assign inventoryItem = 
itemIssuance.getRelatedOne("InventoryItem")/>
-                                            <span 
class="label">${uiLabelMap.FacilityInventory}</span>
+                                            <span 
class="label">${uiLabelMap.CommonInventory}</span>
                                             <a 
href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}&amp;externalLoginKey=${externalLoginKey}"
                                                
class="buttontext">${itemIssuance.inventoryItemId}</a>
                                             <span 
class="label">${uiLabelMap.OrderShipGroup}</span>&nbsp;${itemIssuance.shipGroupSeqId?if_exists}
@@ -614,7 +614,7 @@ under the License.
                                                
class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists}
                                         </#if>
                                         
&nbsp;${shipmentReceipt.datetimeReceived}&nbsp;
-                                        <span 
class="label">${uiLabelMap.FacilityInventory}</span>&nbsp;
+                                        <span 
class="label">${uiLabelMap.CommonInventory}</span>&nbsp;
                                         <a 
href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}&amp;externalLoginKey=${externalLoginKey}"
                                            
class="buttontext">${shipmentReceipt.inventoryItemId}</a>
                                     </td>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1061848&r1=1061847&r2=1061848&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Fri Jan 21 
15:29:40 2011
@@ -141,20 +141,6 @@
         <value xml:lang="en">Hold Shipment</value>
         <value xml:lang="it">Congela spedizione</value>
     </property>
-    <property key="FacilityInventory">
-        <value xml:lang="de">Inventar</value>
-        <value xml:lang="en">Inventory</value>
-        <value xml:lang="es">Inventario</value>
-        <value xml:lang="fr">Stock</value>
-        <value xml:lang="it">Inventario</value>
-        <value xml:lang="nl">Voorraad</value>
-        <value xml:lang="ro">Inventar</value>
-        <value xml:lang="ru">Реестр</value>
-        <value xml:lang="th">สินค้าคงเหลือ</value>
-        <value xml:lang="zh">库存</value>
-        <value xml:lang="zh_CN">库存</value>
-        <value xml:lang="zh_TW">庫存</value>
-    </property>
     <property key="FacilityInventoryItemsMissingCurrencyId">
         <value xml:lang="en">Error: you cannot create inventory items with no 
currencyUomId; you can set a default currency in the PartyAcctgPreference for 
the party ${inventoryItem.ownerPartyId}, or in the general.properties file 
under the key currency.uom.id.default.</value>
         <value xml:lang="it">Errore: tu non puoi creare una riga di inventario 
senza indicare la valuta; puoi imposta la valuta di default attraverso le 
preferenze del soggetto proprietario ${inventoryItem.ownerPartyId}, o nel file 
general.properties alla chiave currency.uom.id.default.</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1061848&r1=1061847&r2=1061848&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Fri Jan 21 15:29:40 
2011
@@ -3968,13 +3968,19 @@
         <value xml:lang="zh_TW">導入日</value>
     </property>
     <property key="CommonInventory">
+        <value xml:lang="de">Inventar</value>
         <value xml:lang="en">Inventory</value>
-        <value xml:lang="fr">Stockage</value>
+        <value xml:lang="es">Inventario</value>
+        <value xml:lang="fr">Stock</value>
         <value xml:lang="hi_IN">वस्तुसूची(Inventory)</value>
         <value xml:lang="it">Inventario</value>
         <value xml:lang="nl">Voorraad</value>
         <value xml:lang="pt_BR">Inventário</value>
+        <value xml:lang="ro">Inventar</value>
+        <value xml:lang="ru">Реестр</value>
+        <value xml:lang="th">สินค้าคงเหลือ</value>
         <value xml:lang="zh">库存</value>
+        <value xml:lang="zh_CN">库存</value>
         <value xml:lang="zh_TW">庫存</value>
     </property>
     <property key="CommonIsA">