svn commit: r508869 - in /ofbiz/trunk/applications/product: webapp/facility/inventory/EditInventoryItem.ftl webapp/facility/inventory/InventoryForms.xml widget/facility/FacilityScreens.xml

[jonesde]

Author: jonesde
Date: Sat Feb 17 21:33:27 2007
New Revision: 508869

URL: http://svn.apache.org/viewvc?view=rev&rev=508869
Log:
Some visual cleanups and an enhancement to see more details related to the inventory item

Modified:
    ofbiz/trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl
    ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl?view=diff&rev=508869&r1=508868&r2=508869
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl Sat Feb 17 21:33:27 2007
@@ -18,10 +18,10 @@
 -->
 
 <div class="head1">${uiLabelMap.ProductEditInventoryItemWithId} [${inventoryItemId?if_exists}]</div>
-<a href="<@ofbizUrl>EditInventoryItem<#if facilityId?exists>?facilityId=${facilityId}</#if></@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewInventoryItem}]</a>
+<a href="<@ofbizUrl>EditInventoryItem<#if facilityId?exists>?facilityId=${facilityId}</#if></@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewInventoryItem}</a>
 <#if inventoryItemId?exists>
-    <a href="<@ofbizUrl>TransferInventoryItem?inventoryItemId=${inventoryItemId}<#if facilityId?exists>&facilityId=${facilityId}</#if></@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductTransferItem}]</a>
-    <a href="<@ofbizUrl>ViewInventoryItemDetail?inventoryItemId=${inventoryItemId}<#if facilityId?exists>&facilityId=${facilityId}</#if></@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductInventoryDetails}]</a>
+    <a href="<@ofbizUrl>TransferInventoryItem?inventoryItemId=${inventoryItemId}<#if facilityId?exists>&facilityId=${facilityId}</#if></@ofbizUrl>" class="buttontext">${uiLabelMap.ProductTransferItem}</a>
+    <a href="<@ofbizUrl>ViewInventoryItemDetail?inventoryItemId=${inventoryItemId}<#if facilityId?exists>&facilityId=${facilityId}</#if></@ofbizUrl>" class="buttontext">${uiLabelMap.ProductInventoryDetails}</a>
 </#if>
 
 <#if inventoryItem?exists>
@@ -66,7 +66,7 @@
         <td>
             <input type="text" name="productId" value="${inventoryItemData.productId?if_exists}" size="20" maxlength="20" class="inputBox">
             <#if (inventoryItem.productId)?has_content>
-                <a href="/catalog/control/EditProduct?productId=${inventoryItem.productId}&externalLoginKey=${externalLoginKey?if_exists}" class="buttontext">[${uiLabelMap.CommonEdit}&nbsp;${uiLabelMap.ProductProduct}&nbsp;${inventoryItem.productId}]</a>
+                <a href="/catalog/control/EditProduct?productId=${inventoryItem.productId}&externalLoginKey=${externalLoginKey?if_exists}" class="buttontext">${uiLabelMap.CommonEdit}&nbsp;${uiLabelMap.ProductProduct}&nbsp;${inventoryItem.productId}</a>
             <#else>
                 <a href="javascript:call_fieldlookup2(document.inventoryItemForm.productId,'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a>
             </#if>
@@ -142,7 +142,7 @@
               </#list>
             </select>
             <#if (inventoryItem.facilityId)?has_content>
-                <a href="<@ofbizUrl>EditFacility?facilityId=${inventoryItem.facilityId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductEditFacility} ${inventoryItem.facilityId}]</a>
+                <a href="<@ofbizUrl>EditFacility?facilityId=${inventoryItem.facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductEditFacility} [${inventoryItem.facilityId}]</a>
             </#if>
             <br/>
             <span class="tabletext">${uiLabelMap.ProductOrEnterContainerId} :</span>
@@ -169,7 +169,7 @@
                     <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
                 </a>
             </span>
-            &nbsp;<a href="<@ofbizUrl>FindFacilityLocation?facilityId=${facilityId?if_exists}&inventoryItemId=${inventoryItemId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductFindLocation}]</a>
+            &nbsp;<a href="<@ofbizUrl>FindFacilityLocation?facilityId=${facilityId?if_exists}&inventoryItemId=${inventoryItemId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductFindLocation}</a>
           <#else>
             <input type="text" size="20" maxsize="20" name="locationSeqId" value="${locationSeqId?if_exists}" class="inputBox">
             <span class="tabletext">
@@ -224,7 +224,7 @@
       <tr>
         <td align="right"><div class="tabletext">${uiLabelMap.ProductSerialAtpQoh}</div></td>
         <td>&nbsp;</td>
-        <td><div class="tabletext" style="color: red;">${uiLabelMap.ProductErrorType} [${inventoryItem.inventoryItemTypeId?if_exists}] ${uiLabelMap.ProductUnknownSpecifyType} .</div></td>
+        <td><div class="tabletext" style="color: red;">${uiLabelMap.ProductErrorType} [${inventoryItem.inventoryItemTypeId?if_exists}] ${uiLabelMap.ProductUnknownSpecifyType}.</div></td>
       </tr>
     </#if>
   <tr>

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?view=diff&rev=508869&r1=508868&r2=508869
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Sat Feb 17 21:33:27 2007
@@ -48,6 +48,18 @@
         <field name="varianceReasonId"><display description="${varianceReason.description}"/></field>
     </form>    
 
+    <form name="ViewInventoryItemShipmentReceipts" type="list"
+        target="" title="" list-name="shipmentReceiptList"
+        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        <actions>
+            <entity-and entity-name="ShipmentReceipt" list-name="shipmentReceiptList">
+                <field-map field-name="inventoryItemId"/>
+            </entity-and>
+        </actions>
+        <auto-fields-entity entity-name="ShipmentReceipt" map-name="shipmentReceipt" default-field-type="display"/>
+        <field name="inventoryItemId"><hidden/></field>
+    </form>    
+    
     <form name="ListInventoryItemDetail" type="list"
         target="" title="" list-name="inventoryItemDetails"
         default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=508869&r1=508868&r2=508869
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sat Feb 17 21:33:27 2007
@@ -494,18 +494,21 @@
                     </condition-list>
                     <order-by field-name="inventoryItemDetailSeqId DESC"/>
                 </entity-condition>
-
             </actions>
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
                     <decorator-section name="body">
                         <container>
-                            <label style="head1">${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.CommonFor} ${inventoryItemId}</label>
+                            <label style="head1">${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.CommonFor} [${inventoryItemId}]</label>
                          </container>
                         <container>
                             <link target="EditInventoryItem?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}" text="${uiLabelMap.CommonView} ${uiLabelMap.ProductInventoryItem} ${inventoryItemId}" style="buttontext"/>
                         </container>
                         <include-form name="ListInventoryItemDetail" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
+                        <container>
+                            <label style="head1">Shipment Receipts for [${inventoryItemId}]</label>
+                        </container>
+                        <include-form name="ViewInventoryItemShipmentReceipts" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>