svn commit: r453817 - in /incubator/ofbiz/trunk/applications/product: config/ webapp/facility/WEB-INF/ webapp/facility/inventory/ widget/facility/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r453817 - in /incubator/ofbiz/trunk/applications/product: config/ webapp/facility/WEB-INF/ webapp/facility/inventory/ widget/facility/

sichen
Author: sichen
Date: Fri Oct  6 17:20:53 2006
New Revision: 453817

URL: http://svn.apache.org/viewvc?view=rev&rev=453817
Log:
new form to display inventory item details of a product

Modified:
    incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl
    incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
    incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

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=453817&r1=453816&r2=453817
==============================================================================
--- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties Fri Oct  6 17:20:53 2006
@@ -636,6 +636,7 @@
 ProductInventory=Inventory
 ProductInventoryAvailNotAvail=Inventory Avail: Not Avail:
 ProductInventoryByProduct=Inventory By Product
+ProductInventoryDetails=Inventory Details
 ProductInventoryFacility=Inventory Facility
 ProductInventoryItem=Inventory Item
 ProductInventoryItemId=Inventory Item Id

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?view=diff&rev=453817&r1=453816&r2=453817
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Fri Oct  6 17:20:53 2006
@@ -444,6 +444,10 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditInventoryItem"/>
     </request-map>
+    <request-map uri="ViewInventoryItemDetail">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ViewInventoryItemDetail"/>
+    </request-map>
     <request-map uri="CreateInventoryItem">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="createInventoryItem"/>
@@ -992,6 +996,7 @@
     <view-map name="SearchInventoryItems" type="screen" page="component://product/widget/facility/FacilityScreens.xml#SearchInventoryItems"/>
 
     <view-map name="EditInventoryItem" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditInventoryItem"/>
+    <view-map name="ViewInventoryItemDetail" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewInventoryItemDetail"/>
     <view-map name="TransferInventoryItem" type="screen" page="component://product/widget/facility/FacilityScreens.xml#TransferInventoryItem"/>
     <view-map name="ReceiveInventory" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ReceiveInventory"/>
     <view-map name="ReceiveReturn" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ReceiveReturn"/>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl?view=diff&rev=453817&r1=453816&r2=453817
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl Fri Oct  6 17:20:53 2006
@@ -19,6 +19,7 @@
 <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>
 </#if>
 
 <#if inventoryItem?exists>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?view=diff&rev=453817&r1=453816&r2=453817
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Fri Oct  6 17:20:53 2006
@@ -45,4 +45,20 @@
         <field name="partyId"><display description="${person.firstName} ${person.lastName} ${partyGroup.groupName} [${physicalInventoryAndVariance.partyId}]"/></field>
         <field name="varianceReasonId"><display description="${varianceReason.description}"/></field>
     </form>    
+
+    <form name="ListInventoryItemDetail" type="list"
+        target="" title="" list-name="inventoryItemDetails"
+        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        <auto-fields-entity entity-name="InventoryItemDetail" map-name="inventoryItemDetail" default-field-type="display"/>
+        <field name="inventoryItemId"><hidden/></field> <!-- this field is redundant -->
+        <field name="orderId" widget-style="buttontext">
+            <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" />
+        </field>
+        <field name="shipmentId" widget-style="buttontext">
+            <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}" />
+        </field>
+        <!-- workEffortId - not sure if it's better to show manufacturing or workeffort app
+        itemIssuanceId, receiptId, physicalInventoryId - no natural screens to show these -->
+    </form>
+
 </forms>

Modified: incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=453817&r1=453816&r2=453817
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Oct  6 17:20:53 2006
@@ -484,6 +484,39 @@
             </widgets>
         </section>
     </screen>
+    <screen name="ViewInventoryItemDetail">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditInventoryItem"/>
+                <set field="headerItem" value="facility"/>
+                <set field="tabButtonItem" value="EditFacilityInventoryItems"/>
+                
+                <set field="inventoryItemId" from-field="parameters.inventoryItemId" />
+                <set field="facilityId" from-field="parameters.facilityId" />
+                
+                <entity-condition entity-name="InventoryItemDetail" list-name="inventoryItemDetails">
+                    <condition-list combine="and">
+                        <condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItemId"/>
+                    </condition-list>
+                    <order-by field-name="inventoryItemDetailSeqId DESC"/>
+                </entity-condition>
+
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonFacilityDecorator">
+                    <decorator-section name="body">
+                        <container>
+                            <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"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     <screen name="TransferInventoryItem">
         <section>
             <actions>