svn commit: r467444 - in /incubator/ofbiz/trunk/applica
Locked
 
|
Author: jacopoc
Date: Tue Oct 24 12:21:15 2006 New Revision: 467444 URL: http://svn.apache.org/viewvc?view=rev&rev=467444 Log: Created a new script used by the Facility->Inventory screen to count inventory in facility. This new version uses a complex dinamic view entity to count the items instead of calling the proper inventory services and so it is very efficient and can handle large amount of data. This new version doesn't support the 'virtual' inventory of mkt packages. The old ViewFacilityInventoryByProduct.bsh script is still available and used by the report under the "reports" menu. This resolves issue OFBIZ-379. Added: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh (with props) Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml incubator/ofbiz/trunk/applications/product/webapp/facility/includes/appheader.ftl incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml incubator/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh?view=diff&rev=467444&r1=467443&r2=467444 ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh Tue Oct 24 12:21:15 2006 @@ -130,31 +130,8 @@ try { beganTransaction = TransactionUtil.begin(); prodsEli = delegator.findListIteratorByCondition(prodView, whereCondition, null, null, UtilMisc.toList("productId"), findOpts); - - // get the indexes for the partial list - lowIndex = ((viewIndex.intValue() * viewSize.intValue()) + 1); - highIndex = (viewIndex.intValue() + 1) * viewSize.intValue(); - - // attempt to get the full size - prodsEli.last(); - productListSize = prodsEli.currentIndex(); - - if (highIndex > productListSize) { - highIndex = productListSize; - } - - // get the partial list for this page - prodsEli.beforeFirst(); - if (productListSize > 0) { - prods = prodsEli.getPartialList(lowIndex, highIndex); - } else { - prods = new ArrayList(); - } + prods = prodsEli.getCompleteList(); prodsEli.close(); - context.put("overrideFormListSize", productListSize); - context.put("highIndex", highIndex); - context.put("lowIndex", lowIndex); - } catch (GenericEntityException e) { String errMsg = "Failure in operation, rolling back transaction"; Debug.logError(e, errMsg, "ViewFacilityInventoryByProduct"); Added: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh?view=auto&rev=467444 ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh (added) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh Tue Oct 24 12:21:15 2006 @@ -0,0 +1,271 @@ +/* + * + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +// This script counts the inventory in the facility using a complex and +// pretty efficient dynamic view entity. +// However, since the quantities are not computed using the inventory +// services (getInventoryAvailableByFacility and getMktgPackagesAvailable) +// there are some limitations: the virtual inventory of marketing packages +// is not computed; you can use the ViewFacilityInventoryByProduct.bsh if you +// need it (but it is slower than this one). + +import java.util.*; +import org.ofbiz.base.util.*; +import org.ofbiz.entity.*; +import org.ofbiz.entity.condition.*; +import org.ofbiz.entity.transaction.*; +import org.ofbiz.entity.util.EntityListIterator; +import org.ofbiz.entity.model.DynamicViewEntity; +import org.ofbiz.entity.model.ModelKeyMap; +import org.ofbiz.entity.model.ModelViewEntity.ComplexAlias; +import org.ofbiz.entity.model.ModelViewEntity.ComplexAliasField; +import org.ofbiz.entity.model.ModelViewEntity.ComplexAliasMember; +import org.ofbiz.entity.util.EntityFindOptions; +import org.ofbiz.product.inventory.*; + +import javolution.util.FastList; +import javolution.util.FastMap; + +delegator = request.getAttribute("delegator"); +dispatcher = request.getAttribute("dispatcher"); + +action = request.getParameter("action"); + +String searchParameterString = ""; +searchParameterString = "action=Y&facilityId=" + facilityId; + +offsetQOH = -1; +offsetATP = -1; +boolean hasOffsetQOH = false; +boolean hasOffsetATP = false; + +EntityListIterator prodsEli = null; +List rows = new ArrayList(); + +if (action != null) { + // ------------------------------ + DynamicViewEntity prodView = new DynamicViewEntity(); + ComplexAlias atpDiffComplexAlias = new ComplexAlias("-"); + + Map conditionMap = UtilMisc.toMap("facilityId", facilityId); + + if (offsetQOHQty != null && offsetQOHQty.length() > 0) { + try { + offsetQOH = Integer.parseInt(offsetQOHQty); + hasOffsetQOH = true; + searchParameterString = searchParameterString + "&offsetQOHQty=" + offsetQOH; + } catch(NumberFormatException nfe) { + } + } + if (offsetATPQty != null && offsetATPQty.length() > 0) { + try { + offsetATP = Integer.parseInt(offsetATPQty); + hasOffsetATP = true; + searchParameterString = searchParameterString + "&offsetATPQty=" + offsetATP; + } catch(NumberFormatException nfe) { + } + } + + prodView.addMemberEntity("PRFA", "ProductFacility"); + prodView.addAlias("PRFA", "productId", null, null, null, Boolean.TRUE, null); + prodView.addAlias("PRFA", "minimumStock", null, null, null, Boolean.TRUE, null); + prodView.addAlias("PRFA", "reorderQuantity", null, null, null, Boolean.TRUE, null); + prodView.addAlias("PRFA", "daysToShip", null, null, null, Boolean.TRUE, null); + prodView.addAlias("PRFA", "facilityId", null, null, null, Boolean.TRUE, null); + + prodView.addMemberEntity("PROD", "Product"); + prodView.addViewLink("PROD", "PRFA", Boolean.FALSE, ModelKeyMap.makeKeyMapList("productId")); + prodView.addAlias("PROD", "internalName", null, null, null, Boolean.TRUE, null); + prodView.addAlias("PROD", "isVirtual", null, null, null, Boolean.TRUE, null); + prodView.addAlias("PROD", "salesDiscontinuationDate", null, null, null, Boolean.TRUE, null); + if (productTypeId != null && productTypeId.length() > 0) { + prodView.addAlias("PROD", "productTypeId", null, null, null, Boolean.TRUE, null); + conditionMap.put("productTypeId", productTypeId); + searchParameterString = searchParameterString + "&productTypeId=" + productTypeId; + } + + prodView.addMemberEntity("IITE", "InventoryItem"); + prodView.addViewLink("PRFA", "IITE", Boolean.FALSE, ModelKeyMap.makeKeyMapList("productId", "productId", "facilityId", "facilityId")); + prodView.addAlias("IITE", "totalQuantityOnHandTotal", "quantityOnHandTotal", null, null, null, "sum"); + prodView.addAlias("IITE", "totalAvailableToPromiseTotal", "availableToPromiseTotal", null, null, null, "sum"); + ComplexAlias qohDiffComplexAlias = new ComplexAlias("-"); + qohDiffComplexAlias.addComplexAliasMember(new ComplexAliasField("IITE", "quantityOnHandTotal", null, "sum")); + qohDiffComplexAlias.addComplexAliasMember(new ComplexAliasField("PRFA", "minimumStock", null, null)); + prodView.addAlias(null, "offsetQOHQtyAvailable", null, null, null, null, null, qohDiffComplexAlias); + ComplexAlias atpDiffComplexAlias = new ComplexAlias("-"); + atpDiffComplexAlias.addComplexAliasMember(new ComplexAliasField("IITE", "availableToPromiseTotal", null, "sum")); + atpDiffComplexAlias.addComplexAliasMember(new ComplexAliasField("PRFA", "minimumStock", null, null)); + prodView.addAlias(null, "offsetATPQtyAvailable", null, null, null, null, null, atpDiffComplexAlias); + + if (searchInProductCategoryId != null && searchInProductCategoryId.length() > 0) { + prodView.addMemberEntity("PRCA", "ProductCategoryMember"); + prodView.addViewLink("PRFA", "PRCA", Boolean.FALSE, ModelKeyMap.makeKeyMapList("productId")); + prodView.addAlias("PRCA", "productCategoryId", null, null, null, Boolean.TRUE, null); + conditionMap.put("productCategoryId", searchInProductCategoryId); + searchParameterString = searchParameterString + "&searchInProductCategoryId=" + searchInProductCategoryId; + } + + if (productSupplierId != null && productSupplierId.length() > 0) { + prodView.addMemberEntity("SPPR", "SupplierProduct"); + prodView.addViewLink("PRFA", "SPPR", Boolean.FALSE, ModelKeyMap.makeKeyMapList("productId")); + prodView.addAlias("SPPR", "partyId", null, null, null, Boolean.TRUE, null); + conditionMap.put("partyId", productSupplierId); + searchParameterString = searchParameterString + "&productSupplierId=" + productSupplierId; + } + + // set distinct on so we only get one row per product + EntityFindOptions findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); + EntityCondition searchCondition = new EntityFieldMap(conditionMap, EntityOperator.AND); + EntityCondition notVirtualCondition = new EntityExpr(new EntityExpr("isVirtual", EntityOperator.EQUALS, null), + EntityOperator.OR, + new EntityExpr("isVirtual", EntityOperator.NOT_EQUAL, "Y")); + + whereConditionsList = UtilMisc.toList(searchCondition, notVirtualCondition); + // add the discontinuation date condition + if (UtilValidate.isNotEmpty(productsSoldThruTimestamp)) { + EntityCondition discontinuationDateCondition = new EntityConditionList(UtilMisc.toList( + new EntityExpr("salesDiscontinuationDate", EntityOperator.EQUALS, null), + new EntityExpr("salesDiscontinuationDate", EntityOperator.GREATER_THAN, productsSoldThruTimestamp)), + EntityOperator.OR); + whereConditionsList.add(discontinuationDateCondition); + searchParameterString = searchParameterString + "&productsSoldThruTimestamp=" + productsSoldThruTimestamp; + } + + // add search on internal name + if (UtilValidate.isNotEmpty(internalName)) { + whereConditionsList.add(new EntityExpr("internalName", true, EntityOperator.LIKE, "%" + internalName + "%", true)); + searchParameterString = searchParameterString + "&internalName=" + internalName; + } + + // add search on productId + if (UtilValidate.isNotEmpty(productId)) { + whereConditionsList.add(new EntityExpr("productId", true, EntityOperator.LIKE, productId + "%", true)); + searchParameterString = searchParameterString + "&productId=" + productId; + } + + List orderBy = FastList.newInstance(); + if (hasOffsetATP) { + orderBy.add("offsetATPQtyAvailable"); + } + if (hasOffsetQOH) { + orderBy.add("offsetQOHQtyAvailable"); + } + orderBy.add("productId"); + + EntityCondition whereCondition = new EntityConditionList(whereConditionsList, EntityOperator.AND); + + boolean beganTransaction = false; + List prods = null; + try { + beganTransaction = TransactionUtil.begin(); + prodsEli = delegator.findListIteratorByCondition(prodView, whereCondition, null, null, orderBy, findOpts); + + // get the indexes for the partial list + lowIndex = ((viewIndex.intValue() * viewSize.intValue()) + 1); + highIndex = (viewIndex.intValue() + 1) * viewSize.intValue(); + + // get the partial list for this page + prods = prodsEli.getPartialList(lowIndex, highIndex); + Iterator prodsIt = prods.iterator(); + + while (prodsIt.hasNext()) { + GenericValue oneProd = prodsIt.next(); + + Double offsetQOHQtyAvailable = oneProd.getDouble("offsetQOHQtyAvailable"); + Double offsetATPQtyAvailable = oneProd.getDouble("offsetATPQtyAvailable"); + if (hasOffsetATP) { + if (offsetATPQtyAvailable != null && offsetATPQtyAvailable.doubleValue() > offsetATP) { + break; + } + } + if (hasOffsetQOH) { + if (offsetQOHQtyAvailable != null && offsetQOHQtyAvailable.doubleValue() > offsetQOH) { + break; + } + } + + Map oneInventory = FastMap.newInstance(); + oneInventory.put("productId", oneProd.getString("productId")); + oneInventory.put("minimumStock", oneProd.getString("minimumStock")); + oneInventory.put("reorderQuantity", oneProd.getString("reorderQuantity")); + oneInventory.put("daysToShip", oneProd.getString("daysToShip")); + oneInventory.put("totalQuantityOnHand", oneProd.get("totalQuantityOnHandTotal")); + oneInventory.put("totalAvailableToPromise", oneProd.get("totalAvailableToPromiseTotal")); + oneInventory.put("offsetQOHQtyAvailable", offsetQOHQtyAvailable); + oneInventory.put("offsetATPQtyAvailable", offsetATPQtyAvailable); + oneInventory.put("quantityOnOrder", InventoryWorker.getOutstandingPurchasedQuantity(oneProd.getString("productId"), delegator)); + rows.add(oneInventory); + } + if (rows.size() < viewSize.intValue()) { + productListSize = lowIndex + rows.size() - 1; + } else { + // attempt to get the full size + if (hasOffsetQOH || hasOffsetATP) { + GenericValue nextValue = null; + int rowProcessed = 0; + while ((nextValue = prodsEli.next()) != null) { + Double offsetQOHQtyAvailable = nextValue.getDouble("offsetQOHQtyAvailable"); + Double offsetATPQtyAvailable = nextValue.getDouble("offsetATPQtyAvailable"); + if (hasOffsetATP) { + if (offsetATPQtyAvailable != null && offsetATPQtyAvailable.doubleValue() > offsetATP) { + break; + } + } + if (hasOffsetQOH) { + if (offsetQOHQtyAvailable != null && offsetQOHQtyAvailable.doubleValue() > offsetQOH) { + break; + } + } + rowProcessed++; + } + productListSize = lowIndex + rows.size() + rowProcessed - 1; + } else { + prodsEli.last(); + productListSize = prodsEli.currentIndex(); + } + } + prodsEli.close(); + if (highIndex > productListSize) { + highIndex = productListSize; + } + context.put("overrideFormListSize", productListSize); + context.put("highIndex", highIndex); + context.put("lowIndex", lowIndex); + + } catch (GenericEntityException e) { + String errMsg = "Failure in operation, rolling back transaction"; + Debug.logError(e, errMsg, "ViewFacilityInventoryByProduct"); + try { + // only rollback the transaction if we started one... + TransactionUtil.rollback(beganTransaction, errMsg, e); + } catch (GenericEntityException e2) { + Debug.logError(e2, "Could not rollback transaction: " + e2.toString(), "ViewFacilityInventoryByProduct"); + } + // after rolling back, rethrow the exception + throw e; + } finally { + if (prodsEli != null) { + try { + prodsEli.close(); + } catch (Exception exc) {} + } + // only commit the transaction if we started one... this will throw an exception if it fails + TransactionUtil.commit(beganTransaction); + } +} +context.put("inventoryByProduct", rows); +context.put("searchParameterString", searchParameterString); Propchange: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?view=diff&rev=467444&r1=467443&r2=467444 ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Tue Oct 24 12:21:15 2006 @@ -65,7 +65,7 @@ </field> </form> <form name="ListFacilityInventoryByProduct" type="list" - target="" title="" list-name="inventoryByProduct" paginate-target="ViewFacilityInventoryByProduct" + target="" title="" list-name="inventoryByProduct" paginate-target="${facilityInventoryByProductScreen}" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> <field name="items" title="${uiLabelMap.ProductProductId}" widget-style="buttontext"> <hyperlink target="EditFacilityInventoryItems?productId=${productId}&facilityId=${facilityId}" description="${productId}"/> Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/includes/appheader.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/includes/appheader.ftl?view=diff&rev=467444&r1=467443&r2=467444 ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/includes/appheader.ftl (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/includes/appheader.ftl Tue Oct 24 12:21:15 2006 @@ -32,7 +32,7 @@ <div class="col-right"><a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div> </#if> <#if facilityId?has_content> - <div class="col-right"><a href="<@ofbizUrl>InventoryReports?facilityId=${facilityId}&action=SEARCH</@ofbizUrl>" class="${selectedRightClassMap.reports?default(unselectedRightClassName)}">${uiLabelMap.CommonReports}</a></div> + <div class="col-right"><a href="<@ofbizUrl>InventoryReports?facilityId=${facilityId}</@ofbizUrl>" class="${selectedRightClassMap.reports?default(unselectedRightClassName)}">${uiLabelMap.CommonReports}</a></div> </#if> <div class="col-fill"> </div> </div> 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=467444&r1=467443&r2=467444 ============================================================================== --- incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Tue Oct 24 12:21:15 2006 @@ -215,9 +215,9 @@ <set field="offsetATPQty" from-field="parameters.offsetATPQty"/> <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp"/> <set field="internalName" from-field="parameters.internalName"/> - <set field="productId" from-field="parameters.productId"/> + <set field="productId" from-field="parameters.productId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh"/> + <script location="component://product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator"> @@ -267,7 +267,7 @@ <set field="internalName" from-field="parameters.internalName"/> <set field="productId" from-field="parameters.productId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh"/> + <script location="component://product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh"/> </actions> <widgets> <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml"> @@ -308,7 +308,7 @@ <set field="internalName" from-field="parameters.internalName"/> <set field="productId" from-field="parameters.productId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh"/> + <script location="component://product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh"/> </actions> <widgets> <decorator-screen name="FoDecorator" location="component://common/widget/CommonScreens.xml"> @@ -340,7 +340,7 @@ <set field="internalName" from-field="parameters.internalName"/> <set field="productId" from-field="parameters.productId"/> - <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh"/> + <script location="component://product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh"/> </actions> <widgets> <decorator-screen name="XmlDecorator" location="component://common/widget/CommonScreens.xml"> Modified: incubator/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml?view=diff&rev=467444&r1=467443&r2=467444 ============================================================================== --- incubator/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml (original) +++ incubator/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml Tue Oct 24 12:21:15 2006 @@ -23,17 +23,27 @@ <screen name="InventoryReports"> <section> <actions> - <set field="titleProperty" value="ProductViewInventoryByProduct"/> - <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> + <set field="titleProperty" value="PageTitleEditFacilityInventoryItems"/> <set field="headerItem" value="reports"/> + <set field="tabButtonItem" value="EditFacilityInventoryItems"/> + <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"/> + + <!-- This is the target of the search form--> + <set field="facilityInventoryByProductScreen" value="InventoryReports"/> + <set field="facilityId" from-field="parameters.facilityId"/> - <set field="productTypeId" from-field=""/> - <set field="searchInProductCategoryId" from-field=""/> - <set field="productSupplierId" from-field=""/> - <set field="offsetQty" from-field=""/> + <set field="productTypeId" from-field="parameters.productTypeId"/> + <set field="searchInProductCategoryId" from-field="parameters.searchInProductCategoryId"/> + <set field="productSupplierId" from-field="parameters.productSupplierId"/> + <set field="offsetQOHQty" from-field="parameters.offsetQOHQty"/> + <set field="offsetATPQty" from-field="parameters.offsetATPQty"/> + <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp"/> + <set field="internalName" from-field="parameters.internalName"/> + <set field="productId" from-field="parameters.productId"/> + <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh"/> - <entity-one entity-name="Facility" value-name="facility" use-chase="true"/> + <entity-one entity-name="Facility" value-name="facility" use-cache="true"/> </actions> <widgets> <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml"> @@ -42,8 +52,12 @@ <label style="head2" text="${uiLabelMap.ProductInventoryByProduct} ${uiLabelMap.CommonFor} ${facility.facilityName}"/> </container> <container> - <include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <link target="ViewFacilityInventoryByProductReport?${searchParameterString}" text="${uiLabelMap.CommonPrint}" style="buttontext"/> + <link target="ViewFacilityInventoryByProductExport?${searchParameterString}" text="${uiLabelMap.CommonExport}" style="buttontext"/> </container> + + <include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |