svn commit: r594546 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: jacopoc
Date: Tue Nov 13 06:23:08 2007 New Revision: 594546 URL: http://svn.apache.org/viewvc?rev=594546&view=rev Log: Converted facility xfer ftl template to form widgets. Implemented two new variants of the inventory detail report: by product and by date. Removed: ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.bsh ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.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?rev=594546&r1=594545&r2=594546&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Tue Nov 13 06:23:08 2007 @@ -367,6 +367,9 @@ ProductBrowseCatalogs=Browse Catalogs ProductBrowseCategories=Browse Categories ProductBulkItem=Bulk Item +ProductByDate=By Date +ProductByInventoryItem=By Inventory Item +ProductByProduct=By Product ProductCarrier=Carrier ProductCarrierServiceCode=Carrier Service Code ProductCarrierShipmentMethod=Carrier Shipment Method Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=594546&r1=594545&r2=594546&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Tue Nov 13 06:23:08 2007 @@ -356,6 +356,9 @@ ProductBrowseCatalogs=Mostra Cataloghi ProductBrowseCategories=Mostra Categorie ProductBulkItem=Riga Bulk +ProductByDate=Per Data +ProductByInventoryItem=Per Inventory Item +ProductByProduct=Per Prodotto ProductCarrier=Corriere ProductCarrierServiceCode=Codice Servizio Corriere ProductCarrierShipmentMethod=Metodo Spedizione Corriere Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.bsh?rev=594546&r1=594545&r2=594546&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.bsh (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.bsh Tue Nov 13 06:23:08 2007 @@ -18,19 +18,9 @@ */ import java.util.*; -import java.io.*; import org.ofbiz.entity.*; import org.ofbiz.entity.condition.*; import org.ofbiz.base.util.*; -import org.ofbiz.widget.html.*; - -delegator = request.getAttribute("delegator"); - -String facilityId = parameters.get("facilityId"); -if (facilityId != null) context.put("facilityId", facilityId); - -GenericValue facility = delegator.findByPrimaryKey("Facility", UtilMisc.toMap("facilityId", facilityId)); -if (facility != null) context.put("facility", facility); //default this to true, ie only show active boolean activeOnly = !"false".equals(request.getParameter("activeOnly")); 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=594546&r1=594545&r2=594546&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Tue Nov 13 06:23:08 2007 @@ -149,11 +149,18 @@ <!-- 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="reportType"> + <drop-down allow-empty="false"> + <option key="BY_ITEM" description="${uiLabelMap.ProductByInventoryItem}"/> + <option key="BY_PRODUCT" description="${uiLabelMap.ProductByProduct}"/> + <option key="BY_DATE" description="${uiLabelMap.ProductByDate}"/> + </drop-down> + </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"> + <form name="ListFacilityInventoryItemsDetailsByItem" 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"/> @@ -168,7 +175,7 @@ <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"> + <field name="productId" position="1" use-when="showPosition1" widget-area-style="viewManyTR1" widget-style="buttontext"> <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"> @@ -203,6 +210,86 @@ <field name="returnId" position="2"><display/></field> <field name="returnItemSeqId" position="2"><display/></field> </form> + <form name="ListFacilityInventoryItemsDetailsByProduct" 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|-effectiveDate|inventoryItemId|-inventoryItemDetailSeqId|quantityOnHandTotal"/> + </service> + </actions> + <row-actions> + <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}" type="Boolean"/> + </row-actions> + + <field name="productId" position="1" use-when="showPosition1" widget-area-style="viewManyTR1" widget-style="buttontext"> + <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> + </field> + + <field name="effectiveDate" position="2"><display/></field> + <field name="inventoryItemId" widget-style="buttontext" position="2"> + <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&facilityId=${facilityId}" description="${inventoryItemId}"/> + </field> + <field name="inventoryItemDetailSeqId" 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="ListFacilityInventoryItemsDetailsByDate" 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="-effectiveDate|productId|inventoryItemId|-inventoryItemDetailSeqId|quantityOnHandTotal"/> + </service> + </actions> + + <field name="effectiveDate"><display/></field> + <field name="productId" widget-style="buttontext"> + <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> + </field> + <field name="inventoryItemId" widget-style="buttontext"> + <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&facilityId=${facilityId}" description="${inventoryItemId}"/> + </field> + <field name="inventoryItemDetailSeqId"><display/></field> + <field name="quantityOnHandDiff"><display/></field> + <field name="availableToPromiseDiff"><display/></field> + + <field name="reasonEnumId"> + <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/> + </field> + <field name="description"><display/></field> + <field name="orderId" widget-style="buttontext"> + <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" /> + </field> + <field name="orderItemSeqId"><display/></field> + <field name="shipmentId" widget-style="buttontext"> + <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}" /> + </field> + <field name="shipmentItemSeqId"><display/></field> + <field name="workEffortId" widget-style="buttontext"> + <hyperlink target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app" description="${workEffortId}" /> + </field> + <field name="returnId"><display/></field> + <field name="returnItemSeqId"><display/></field> + </form> <form name="FindFacilityInventoryByProduct" type="single" target="${facilityInventoryByProductScreen}" title="" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> @@ -496,4 +583,115 @@ <field name="totalRetailPriceGrandTotal" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductRetailPrice}"><display/></field> <field name="quot7" title="""><display description="""/></field> </form> + + <form name="ToFacilityTransfers" type="list" target="" title="" list-name="toTransfers"> + <row-actions> + <entity-one entity-name="InventoryItem" value-name="inventoryItem"> + <field-map field-name="inventoryItemId"/> + </entity-one> + <entity-one entity-name="Product" value-name="product"> + <field-map field-name="productId" env-name="inventoryItem.productId"/> + </entity-one> + </row-actions> + + <field name="inventoryTransferId" widget-style="buttontext"> + <hyperlink target="TransferInventoryItem?inventoryTransferId=${inventoryTransferId}" description="${inventoryTransferId}"/> + </field> + <field name="inventoryItemId" widget-style="buttontext"> + <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}"/> + </field> + <field name="facilityId" widget-style="buttontext"> + <hyperlink target="EditFacility?facilityId=${facilityId}" description="${facilityId}"/> + </field> + <field name="facilityName" entry-name="facilityId"> + <display-entity entity-name="Facility" key-field-name="facilityId" description="${facilityName}"/> + </field> + <field name="locationSeqId"><display/></field> + <field name="productId" entry-name="product.productId" widget-style="buttontext"> + <hyperlink target="/catalog/control/EditProduct?productId=${product.productId}" target-type="inter-app" description="${product.productId}"/> + </field> + <field name="productName" entry-name="product.internalName"><display/></field> + <field name="serialNumber" entry-name="inventoryItem.serialNumber"><display/></field> + <field name="atpQoh" title="${uiLabelMap.ProductAtpQoh}"><display description="${inventoryItem.availableToPromiseTotal}/${inventoryItem.quantityOnHandTotal}"/></field> + <field name="locationSeqIdTo"><display/></field> + <field name="sendDate"><display/></field> + <field name="receiveDate"><display/></field> + <field name="statusId"> + <display-entity entity-name="StatusItem"/> + </field> + </form> + <form name="FromFacilityTransfers" type="list" target="" title="" list-name="fromTransfers"> + <row-actions> + <entity-one entity-name="InventoryItem" value-name="inventoryItem"> + <field-map field-name="inventoryItemId"/> + </entity-one> + <entity-one entity-name="Product" value-name="product"> + <field-map field-name="productId" env-name="inventoryItem.productId"/> + </entity-one> + </row-actions> + <field name="inventoryTransferId" widget-style="buttontext"> + <hyperlink target="TransferInventoryItem?inventoryTransferId=${inventoryTransferId}" description="${inventoryTransferId}"/> + </field> + <field name="inventoryItemId" widget-style="buttontext"> + <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}"/> + </field> + <field name="facilityIdTo" widget-style="buttontext"> + <hyperlink target="EditFacility?facilityId=${facilityIdTo}" description="${facilityIdTo}"/> + </field> + <field name="facilityName" entry-name="facilityIdTo"> + <display-entity entity-name="Facility" key-field-name="facilityId" description="${facilityName}"/> + </field> + <field name="locationSeqIdTo"><display/></field> + <field name="productId" entry-name="product.productId" widget-style="buttontext"> + <hyperlink target="/catalog/control/EditProduct?productId=${product.productId}" target-type="inter-app" description="${product.productId}"/> + </field> + <field name="productName" entry-name="product.internalName"><display/></field> + <field name="serialNumber" entry-name="inventoryItem.serialNumber"><display/></field> + <field name="atpQoh" title="${uiLabelMap.ProductAtpQoh}"><display description="${inventoryItem.availableToPromiseTotal}/${inventoryItem.quantityOnHandTotal}"/></field> + <field name="locationSeqId"><display/></field> + <field name="sendDate"><display/></field> + <field name="receiveDate"><display/></field> + <field name="statusId"> + <display-entity entity-name="StatusItem"/> + </field> + </form> + + <form name="FromFacilityTransfersComplete" type="multi" target="CompleteRequestedTransfers?completeRequested=true&facilityId=${facilityId}" title="" list-name="fromTransfers"> + <row-actions> + <entity-one entity-name="InventoryItem" value-name="inventoryItem"> + <field-map field-name="inventoryItemId"/> + </entity-one> + <entity-one entity-name="Product" value-name="product"> + <field-map field-name="productId" env-name="inventoryItem.productId"/> + </entity-one> + </row-actions> + <field name="inventoryTransferId" widget-style="buttontext"> + <hyperlink target="TransferInventoryItem?inventoryTransferId=${inventoryTransferId}" description="${inventoryTransferId}"/> + </field> + <field name="inventoryItemId" widget-style="buttontext"> + <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}"/> + </field> + <field name="facilityIdTo" widget-style="buttontext"> + <hyperlink target="EditFacility?facilityId=${facilityIdTo}" description="${facilityIdTo}" also-hidden="false"/> + </field> + <field name="facilityName" entry-name="facilityIdTo"> + <display-entity entity-name="Facility" key-field-name="facilityId" description="${facilityName}" also-hidden="false"/> + </field> + <field name="locationSeqIdTo"><display also-hidden="false"/></field> + <field name="productId" entry-name="product.productId" widget-style="buttontext"> + <hyperlink target="/catalog/control/EditProduct?productId=${product.productId}" target-type="inter-app" description="${product.productId}" also-hidden="false"/> + </field> + <field name="productName" entry-name="product.internalName"><display also-hidden="false"/></field> + <field name="serialNumber" entry-name="inventoryItem.serialNumber"><display also-hidden="false"/></field> + <field name="atpQoh" title="${uiLabelMap.ProductAtpQoh}"><display description="${inventoryItem.availableToPromiseTotal}/${inventoryItem.quantityOnHandTotal}" also-hidden="false"/></field> + <field name="locationSeqId"><display also-hidden="false"/></field> + <field name="sendDate"><display also-hidden="false"/></field> + <field name="receiveDate"><display also-hidden="false"/></field> + <field name="statusId"><hidden value="IXF_COMPLETE"/></field> + <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}"> + <submit/> + </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?rev=594546&r1=594545&r2=594546&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Tue Nov 13 06:23:08 2007 @@ -77,6 +77,7 @@ </widgets> </section> </screen> + <screen name="FindFacilityTransfers"> <section> <actions> @@ -84,14 +85,46 @@ <set field="headerItem" value="facility"/> <set field="tabButtonItem" value="FindFacilityTransfers"/> + <set field="facilityId" from-field="parameters.facilityId"/> + <entity-one entity-name="Facility" value-name="facility"/> <script location="component://product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.bsh"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> + <container> + <label style="head3">${uiLabelMap.CommonView} </label> + <link target="FindFacilityTransfers?facilityId=${facilityId}&activeOnly=true" text="${uiLabelMap.ProductActiveOnly}" style="buttontext"/> + <link target="FindFacilityTransfers?facilityId=${facilityId}&activeOnly=false" text="${uiLabelMap.CommonAll}" style="buttontext"/> + </container> + <container> + <link target="FindFacilityTransfers?facilityId=${facilityId}&completeRequested=true" text="${uiLabelMap.ProductCompleteRequestedTransfers}" style="buttontext"/> + <link target="TransferInventoryItem?facilityId=${facilityId}" text="${uiLabelMap.ProductInventoryTransfer}" style="buttontext"/> + </container> <platform-specific> <html><html-template location="component://product/webapp/facility/facility/FindFacilityTransfers.ftl"/></html> </platform-specific> + <container> + <label style="head1">${uiLabelMap.ProductInventoryTransfersFor} ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]</label> + </container> + <container> + <label style="head2">${uiLabelMap.CommonTo}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]</label> + </container> + <include-form name="ToFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <container> + <label style="head2">${uiLabelMap.CommonFrom}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]</label> + </container> + <section> + <condition> + <if-compare field-name="parameters.completeRequested" operator="equals" value="true"/> + </condition> + <widgets> + <include-form name="FromFacilityTransfersComplete" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + <fail-widgets> + <include-form name="FromFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </fail-widgets> + </section> </decorator-section> </decorator-screen> </widgets> @@ -400,7 +433,30 @@ <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"/> + <section> + <condition> + <if-compare field-name="parameters.reportType" operator="equals" value="BY_ITEM"/> + </condition> + <widgets> + <include-form name="ListFacilityInventoryItemsDetailsByItem" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + <section> + <condition> + <if-compare field-name="parameters.reportType" operator="equals" value="BY_PRODUCT"/> + </condition> + <widgets> + <include-form name="ListFacilityInventoryItemsDetailsByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + <section> + <condition> + <if-compare field-name="parameters.reportType" operator="equals" value="BY_DATE"/> + </condition> + <widgets> + <include-form name="ListFacilityInventoryItemsDetailsByDate" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |