svn commit: r442740 - in /incubator/ofbiz/trunk/applications/product: config/ProductUiLabels.properties webapp/catalog/product/EditProductInventoryItems.ftl

[sichen]

Author: sichen
Date: Tue Sep 12 15:29:38 2006
New Revision: 442740

URL: http://svn.apache.org/viewvc?view=rev&rev=442740
Log:
Added link from catalog manager inventory screen to the facility manager 
receive inventory screen.  Also changed the ui label of Inventory Receive to 
Receive Inventory in English

Modified:
    incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    
incubator/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl

Modified: 
incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: 
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=442740&r1=442739&r2=442740
==============================================================================
--- 
incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties 
(original)
+++ 
incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties 
Tue Sep 12 15:29:38 2006
@@ -642,7 +642,7 @@
 ProductInventoryItemsFor=Inventory Items for
 ProductInventoryItemsToPick=Inventory Items to Pick
 ProductInventoryMessage=Inventory Message
-ProductInventoryReceive=Inventory Receive
+ProductInventoryReceive=Receive Inventory
 ProductInventoryRequiredProduct=Should inventory be required to purchase this 
product? If not specified defaults to the Catalog setting.
 ProductInventorySummary=Inventory Summary
 ProductInventoryTransfer=Inventory Transfer

Modified: 
incubator/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
URL: 
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?view=diff&rev=442740&r1=442739&r2=442740
==============================================================================
--- 
incubator/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
 (original)
+++ 
incubator/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
 Tue Sep 12 15:29:38 2006
@@ -47,7 +47,8 @@
         <#assign outgoingQuantityTotal = 
manufacturingOutQuantitySummary.estimatedQuantityTotal?if_exists>
 
         <tr>
-            <td><div class="tabletext">${(facility.facilityName)?if_exists} 
[${facilityId?default("[No Facility]")}]</div></td>
+            <td><div class="tabletext">${(facility.facilityName)?if_exists} 
[${facilityId?default("[No Facility]")}] 
+            <a 
href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}"
 class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></div></td>
             <td><div class="tabletext"><#if 
totalAvailableToPromise?exists>${totalAvailableToPromise}<#else>&nbsp;</#if></div></td>
             <td><div class="tabletext"><#if 
totalQuantityOnHand?exists>${totalQuantityOnHand}<#else>&nbsp;</#if></div></td>
             <td><div class="tabletext"><#if 
mktgPkgATP?exists>${mktgPkgATP}<#else>&nbsp;</#if></div></td>