Author: jacopoc
Date: Wed Mar 21 04:43:22 2007
New Revision: 520846
URL:
http://svn.apache.org/viewvc?view=rev&rev=520846Log:
Added form to the 'inventory item detail' screen to show information about order's reservations.
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.properties
ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=520846&r1=520845&r2=520846==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Wed Mar 21 04:43:22 2007
@@ -665,6 +665,7 @@
ProductInventoryFacility=Inventory Facility
ProductInventoryItem=Inventory Item
ProductInventoryItemId=Inventory Item Id
+ProductInventoryItemReservations=Inventory Item Reservations
ProductInventoryItemType=Inventory Item Type
ProductInventoryItemTypeId=InventoryItem Type ID
ProductInventoryItems=Inventory Items
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=520846&r1=520845&r2=520846==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Wed Mar 21 04:43:22 2007
@@ -70,5 +70,11 @@
<!-- workEffortId - not sure if it's better to show manufacturing or workeffort app
itemIssuanceId, receiptId, physicalInventoryId - no natural screens to show these -->
</form>
-
+ <form name="InventoryItemReservations" type="list" target="" title="" list-name="inventoryItemReservations">
+ <auto-fields-entity entity-name="OrderItemShipGrpInvRes" default-field-type="display"/>
+ <field name="inventoryItemId"><hidden/></field>
+ <field name="orderId" widget-style="buttontext">
+ <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" />
+ </field>
+ </form>
</forms>
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=520846&r1=520845&r2=520846==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Wed Mar 21 04:43:22 2007
@@ -456,6 +456,12 @@
<set field="displayWithNoFacility" value="Y"/>
<script location="component://product/webapp/facility/WEB-INF/actions/inventory/EditInventoryItem.bsh"/>
+ <entity-condition entity-name="OrderItemShipGrpInvRes" list-name="inventoryItemReservations">
+ <condition-list combine="and">
+ <condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItemId"/>
+ </condition-list>
+ <order-by field-name="reservedDatetime"/>
+ </entity-condition>
</actions>
<widgets>
<decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
@@ -463,6 +469,10 @@
<platform-specific>
<html><html-template location="component://product/webapp/facility/inventory/EditInventoryItem.ftl"/></html>
</platform-specific>
+ <container>
+ <label style="head2">${uiLabelMap.ProductInventoryItemReservations}</label>
+ </container>
+ <include-form name="InventoryItemReservations" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
<section>
<condition>
<if-compare field-name="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/>
Locked
