You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/11/07 17:17:54 UTC
svn commit: r592805 - in /ofbiz/trunk/applications: manufacturing/config/
product/config/ product/data/ product/webapp/facility/WEB-INF/
product/webapp/facility/facility/ product/webapp/facility/inventory/
product/widget/facility/
Author: jacopoc
Date: Wed Nov 7 08:17:53 2007
New Revision: 592805
URL: http://svn.apache.org/viewvc?rev=592805&view=rev
Log:
Implemented new screen to search/display the inventory movements (InventoryItemDetails) in a facility.
Modified:
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties
ofbiz/trunk/applications/product/config/ProductUiLabels.properties
ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
ofbiz/trunk/applications/product/data/ProductTypeData.xml
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
ofbiz/trunk/applications/product/widget/facility/Menus.xml
Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties?rev=592805&r1=592804&r2=592805&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties Wed Nov 7 08:17:53 2007
@@ -242,7 +242,7 @@
ManufacturingStartProductionRunTask=Inizio
ManufacturingCancel=Cancella
ManufacturingCompleteProductionRunTask=Completa
-ManufacturingIssueProductionRunTask=Componenti con Problemi
+ManufacturingIssueProductionRunTask=Preleva i Componenti
ManufacturingDeclareProductionRunTask=Dichiarazione
ManufacturingProductionRunClose=Chiudi Ordine di Produzione
ManufacturingIssuedQuantity=Quantit\u00e0 Prelevata
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=592805&r1=592804&r2=592805&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Wed Nov 7 08:17:53 2007
@@ -199,6 +199,7 @@
PageTitleSearchResults=Search Results
PageTitleTransferInventoryItem=Transfer Inventory Item
PageTitleViewFacilityContactMechanism=View Facility Contact Mechanism
+PageTitleViewFacilityInventoryItemsDetails=View Facility Inventory Items Details
PageTitleViewProductAgreements=View Product Agreements
PageTitleViewProductManufacturing=View Product Manufacturing
PageTitleViewShipment=View Shipment
@@ -703,6 +704,8 @@
ProductInventoryItemTypeId=InventoryItem Type ID
ProductInventoryItems=Inventory Items
ProductInventoryItemsFor=Inventory Items for
+ProductInventoryItemsDetails=Inventory Items Details
+ProductInventoryItemsDetailsFor=Inventory Items Details for
ProductInventoryItemsToPick=Inventory Items to Pick
ProductInventoryItemTotals=Inventory Item Totals
ProductInventoryItemTotalsExport=Export Inventory Item Totals
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=592805&r1=592804&r2=592805&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Wed Nov 7 08:17:53 2007
@@ -191,6 +191,7 @@
PageTitleSearchResults=Risultati Ricerca
PageTitleTransferInventoryItem=Trasferimento Riga Inventario
PageTitleViewFacilityContactMechanism=Mostra Contatto Stabilimento
+PageTitleViewFacilityInventoryItemsDetails=Visualizza i Movimenti di Magazzino
PageTitleViewProductAgreements=Mostra Accordi Prodotto
PageTitleViewProductManufacturing=Mostra Produzione Prodotti
PageTitleViewShipment=Mostra Spedizione
@@ -682,6 +683,8 @@
ProductInventoryItemTypeId=Tipo Riga Inventario
ProductInventoryItems=Righe Inventario
ProductInventoryItemsFor=Righe Inventario per
+ProductInventoryItemsDetails=Movimenti
+ProductInventoryItemsDetailsFor=Movimenti per
ProductInventoryItemsToPick=Righe Inventario da Prelevare
ProductInventoryMessage=Messaggio Inventario
ProductInventoryReceive=Ricevi Inventario
Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=592805&r1=592804&r2=592805&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Wed Nov 7 08:17:53 2007
@@ -74,6 +74,11 @@
<Enumeration description="Less Unit Cost" enumCode="LUNIT_COST" enumId="INVRO_LUNIT_COST" sequenceId="06" enumTypeId="INV_RES_ORDER"/>
<EnumerationType description="Inventory Item Detail Reason" enumTypeId="IID_REASON" hasTable="N" parentTypeId=""/>
+ <Enumeration description="Lost" enumCode="VAR_LOST" enumId="VAR_LOST" sequenceId="01" enumTypeId="IID_REASON"/>
+ <Enumeration description="Stolen" enumCode="VAR_STOLEN" enumId="VAR_STOLEN" sequenceId="02" enumTypeId="IID_REASON"/>
+ <Enumeration description="Found" enumCode="VAR_FOUND" enumId="VAR_FOUND" sequenceId="03" enumTypeId="IID_REASON"/>
+ <Enumeration description="Damaged" enumCode="VAR_DAMAGED" enumId="VAR_DAMAGED" sequenceId="04" enumTypeId="IID_REASON"/>
+ <Enumeration description="Sample (Giveaway)" enumCode="VAR_SAMPLE" enumId="VAR_SAMPLE" sequenceId="05" enumTypeId="IID_REASON"/>
<EnumerationType description="Product Store Payment Service Type" enumTypeId="PRDS_PAYSVC" hasTable="N" parentTypeId=""/>
<Enumeration description="Payment Authorization Service" enumCode="PAY_AUTH" enumId="PRDS_PAY_AUTH" sequenceId="01" enumTypeId="PRDS_PAYSVC"/>
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=592805&r1=592804&r2=592805&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Wed Nov 7 08:17:53 2007
@@ -127,6 +127,10 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="EditFacilityInventoryItems"/>
</request-map>
+ <request-map uri="ViewFacilityInventoryItemsDetails">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewFacilityInventoryItemsDetails"/>
+ </request-map>
<!-- <request-map uri="DeleteFacilityInventoryItem">
<security https="true" auth="true"/>
<event type="service" path="" invoke="deleteInventoryItem"/>
@@ -1109,6 +1113,7 @@
<view-map name="FindFacilityLocation" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FindFacilityLocation"/>
<view-map name="EditFacilityLocation" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityLocation"/>
<view-map name="EditFacilityInventoryItems" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityInventoryItems"/>
+ <view-map name="ViewFacilityInventoryItemsDetails" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryItemsDetails"/>
<view-map name="SearchInventoryItemsByLabels" type="screen" page="component://product/widget/facility/FacilityScreens.xml#SearchInventoryItemsByLabels"/>
<view-map name="ViewFacilityInventoryByProduct" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProduct"/>
<view-map name="ViewFacilityInventoryByProductSimple" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductSimple"/>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=592805&r1=592804&r2=592805&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Wed Nov 7 08:17:53 2007
@@ -115,6 +115,95 @@
<field name="softIdentifier"><display/></field>
<field name="quantityOnHandTotal"><display description="${availableToPromiseTotal} / ${quantityOnHandTotal}"/></field>
</form>
+
+ <form name="SearchInventoryItemsDetailsParams" type="single" target="ViewFacilityInventoryItemsDetails">
+ <field name="facilityId">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName} [${facilityId}]">
+ <entity-order-by field-name="facilityName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="effectiveDate"><date-find/></field>
+ <field name="productId"><text-find/></field>
+ <field name="inventoryItemId"><text-find/></field>
+ <field name="serialNumber"><text-find/></field>
+ <field name="softIdentifier"><text/></field>
+ <field name="manufacturerPartyId">
+ <lookup target-form-name="LookupPartyName"/>
+ </field>
+ <field name="orderId">
+ <lookup target-form-name="LookupOrderHeader"/>
+ </field>
+ <field name="shipmentId"><text/></field>
+ <field name="returnId"><text/></field>
+ <field name="workEffortId"><text/></field>
+ <field name="reasonEnumId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+ <entity-constraint name="enumTypeId" value="IID_REASON"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <!-- the content of the softIdentifier field is converted from hex to int if it starts with "0x";
+ this is a nice example of using JavaScript in a form widget definition -->
+ <field name="quantityOnHandDiff" tooltip="By default, only movements affecting the qoh are shown; remove the 0 here to get also the movements related to reservations."><text-find default-value="0" default-option="notEqual" ignore-case="false"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" event="onClick" action="javascript:var field=document.SearchInventoryItemsParams.softIdentifier;var tmp=field.value;if (tmp.substring(0, 2) == '0x') {tmp=parseInt(tmp, 16)};if (!isNaN(tmp)) {field.value=tmp};return true;">
+ <submit button-type="button"/>
+ </field>
+ </form>
+ <form name="ListFacilityInventoryItemsDetails" type="list" target="" title="" list-name="listIt">
+ <actions>
+ <service service-name="performFind" result-map-name="results" result-map-list-name="listIt">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" value="InventoryItemAndDetail"/>
+ <field-map field-name="orderBy" value="productId|inventoryItemId|-inventoryItemDetailSeqId|-effectiveDate|quantityOnHandTotal"/>
+ </service>
+ </actions>
+ <row-actions>
+ <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("inventoryItemId");return new Boolean(!(prev!=null&&prev.equals(inventoryItemId)));}" type="Boolean"/>
+ </row-actions>
+
+ <field name="inventoryItemId" widget-style="buttontext" position="1" use-when="showPosition1" widget-area-style="viewManyTR1">
+ <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&facilityId=${facilityId}" description="${inventoryItemId}"/>
+ </field>
+ <field name="productId" position="1" use-when="showPosition1" widget-area-style="viewManyTR1">
+ <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/>
+ </field>
+ <field name="quantityOnHandTotal" position="1" use-when="showPosition1" widget-area-style="viewManyTR1">
+ <display description="${quantityOnHandTotal}"/>
+ </field>
+ <field name="availableToPromiseTotal" position="1" use-when="showPosition1" widget-area-style="viewManyTR1">
+ <display description="${availableToPromiseTotal}"/>
+ </field>
+ <field name="serialNumber" position="1" use-when="showPosition1" widget-area-style="viewManyTR1"><display/></field>
+ <field name="softIdentifier" position="1" use-when="showPosition1" widget-area-style="viewManyTR1"><display/></field>
+
+ <field name="inventoryItemDetailSeqId" position="2"><display/></field>
+ <field name="effectiveDate" position="2"><display/></field>
+ <field name="quantityOnHandDiff" position="2"><display/></field>
+ <field name="availableToPromiseDiff" position="2"><display/></field>
+
+ <field name="reasonEnumId" position="2">
+ <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ </field>
+ <field name="description" position="2"><display/></field>
+ <field name="orderId" widget-style="buttontext" position="2">
+ <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" />
+ </field>
+ <field name="orderItemSeqId" position="2"><display/></field>
+ <field name="shipmentId" widget-style="buttontext" position="2">
+ <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}" />
+ </field>
+ <field name="shipmentItemSeqId" position="2"><display/></field>
+ <field name="workEffortId" widget-style="buttontext" position="2">
+ <hyperlink target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app" description="${workEffortId}" />
+ </field>
+ <field name="returnId" position="2"><display/></field>
+ <field name="returnItemSeqId" position="2"><display/></field>
+ </form>
+
<form name="FindFacilityInventoryByProduct" type="single" target="${facilityInventoryByProductScreen}" title=""
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<field name="facilityId"><hidden/></field>
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?rev=592805&r1=592804&r2=592805&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Wed Nov 7 08:17:53 2007
@@ -138,6 +138,9 @@
<field name="shipmentId" widget-style="buttontext">
<hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}" />
</field>
+ <field name="reasonEnumId">
+ <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ </field>
<!-- workEffortId - not sure if it's better to show manufacturing or workeffort app
itemIssuanceId, receiptId, physicalInventoryId - no natural screens to show these -->
</form>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=592805&r1=592804&r2=592805&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Wed Nov 7 08:17:53 2007
@@ -377,6 +377,36 @@
</section>
</screen>
+ <screen name="ViewFacilityInventoryItemsDetails">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleViewFacilityInventoryItemsDetails"/>
+ <set field="headerItem" value="facility"/>
+ <set field="tabButtonItem" value="ViewFacilityInventoryItemsDetails"/>
+
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+
+ <entity-one entity-name="Facility" value-name="facility"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
+ <decorator-section name="body">
+ <container>
+ <label style="head1">${uiLabelMap.ProductInventoryItemsDetailsFor}</label>
+ <label style="head2">${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label>
+ </container>
+ <container>
+ <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
+ </container>
+ <include-form name="SearchInventoryItemsDetailsParams" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListFacilityInventoryItemsDetails" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="InventoryItemTotals">
<section>
<actions>
@@ -658,7 +688,7 @@
<condition-list combine="and">
<condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItemId"/>
</condition-list>
- <order-by field-name="inventoryItemDetailSeqId DESC"/>
+ <order-by field-name="-inventoryItemDetailSeqId"/>
</entity-condition>
</actions>
<widgets>
Modified: ofbiz/trunk/applications/product/widget/facility/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/Menus.xml?rev=592805&r1=592804&r2=592805&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Wed Nov 7 08:17:53 2007
@@ -44,6 +44,9 @@
<menu-item name="EditFacilityInventoryItems" title="${uiLabelMap.ProductInventoryItems}">
<link target="EditFacilityInventoryItems?facilityId=${facilityId}"/>
</menu-item>
+ <menu-item name="ViewFacilityInventoryItemsDetails" title="${uiLabelMap.ProductInventoryItemsDetails}">
+ <link target="ViewFacilityInventoryItemsDetails?facilityId=${facilityId}"/>
+ </menu-item>
<menu-item name="ReceiveInventory" title="${uiLabelMap.ProductInventoryReceive}">
<link target="ReceiveInventory?facilityId=${facilityId}"/>
</menu-item>