svn commit: r682281 - in /ofbiz/trunk/applications: order/entitydef/ product/webapp/catalog/product
Locked
 
|
Author: jacopoc
Date: Mon Aug 4 00:58:52 2008 New Revision: 682281 URL: http://svn.apache.org/viewvc?rev=682281&view=rev Log: Misc small enhancements to the Product Catalog "Inventory" screen. Added: ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl (with props) Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml?rev=682281&r1=682280&r2=682281&view=diff ============================================================================== --- ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml (original) +++ ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml Mon Aug 4 00:58:52 2008 @@ -67,6 +67,8 @@ <alias entity-alias="OI" name="itemStatusId" field="statusId"/> <alias entity-alias="OI" name="estimatedShipDate"/> <alias entity-alias="OI" name="estimatedDeliveryDate"/> + <alias entity-alias="OI" name="shipBeforeDate"/> + <alias entity-alias="OI" name="shipAfterDate"/> <alias entity-alias="OI" name="orderItemTypeId"/> <view-link entity-alias="OH" rel-entity-alias="OI"> <key-map field-name="orderId"/> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=682281&r1=682280&r2=682281&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Mon Aug 4 00:58:52 2008 @@ -17,91 +17,6 @@ under the License. --> <#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists> -<#if parameters.showAllFacilities?exists> -<a href="EditProductInventoryItems?productId=${productId}" class="buttontext">${uiLabelMap.ProductShowProductFacilities}</a> -<#else> -<a href="EditProductInventoryItems?productId=${productId}&showAllFacilities=Y" class="buttontext">${uiLabelMap.ProductShowAllFacilities}</a> -</#if> -<div class="screenlet"> - <div class="screenlet-title-bar"> - <h3>${uiLabelMap.ProductVariantProductInventorySummary}</h3> - </div> - <div class="screenlet-body"> - <table cellspacing="0" class="basic-table"> - <tr class="header-row"> - <td><b>${uiLabelMap.ProductFacility}</b></td> - <td><b>${uiLabelMap.ProductAtp}</b></td> - <td><b>${uiLabelMap.ProductQoh}</b></td> - <td><b>${uiLabelMap.ProductMarketingPackageATP}</b></td> - <td><b>${uiLabelMap.ProductMarketingPackageQOH}</b></td> - <td><b>${uiLabelMap.ProductIncomingShipments}</b></td> - <td><b>${uiLabelMap.ProductIncomingProductionRuns}</b></td> - <td><b>${uiLabelMap.ProductOutgoingProductionRuns}</b></td> - </tr> - <#assign rowClass = "2"> - <#list quantitySummaryByFacility.values() as quantitySummary> - <#if quantitySummary.facilityId?exists> - <#assign facilityId = quantitySummary.facilityId> - <#assign facility = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId))> - <#assign manufacturingInQuantitySummary = manufacturingInQuantitySummaryByFacility.get(facilityId)?if_exists> - <#assign manufacturingOutQuantitySummary = manufacturingOutQuantitySummaryByFacility.get(facilityId)?if_exists> - <#assign totalQuantityOnHand = quantitySummary.totalQuantityOnHand?if_exists> - <#assign totalAvailableToPromise = quantitySummary.totalAvailableToPromise?if_exists> - <#assign mktgPkgATP = quantitySummary.mktgPkgATP?if_exists> - <#assign mktgPkgQOH = quantitySummary.mktgPkgQOH?if_exists> - <#assign incomingShipmentAndItemList = quantitySummary.incomingShipmentAndItemList?if_exists> - <#assign incomingProductionRunList = manufacturingInQuantitySummary.incomingProductionRunList?if_exists> - <#assign incomingQuantityTotal = manufacturingInQuantitySummary.estimatedQuantityTotal?if_exists> - <#assign outgoingProductionRunList = manufacturingOutQuantitySummary.outgoingProductionRunList?if_exists> - <#assign outgoingQuantityTotal = manufacturingOutQuantitySummary.estimatedQuantityTotal?if_exists> - <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td>${(facility.facilityName)?if_exists} [${facilityId?default("[No Facility]")}] - <a href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></td> - <td><#if totalAvailableToPromise?exists>${totalAvailableToPromise}<#else> </#if></td> - <td><#if totalQuantityOnHand?exists>${totalQuantityOnHand}<#else> </#if></td> - <td><#if mktgPkgATP?exists>${mktgPkgATP}<#else> </#if></td> - <td><#if mktgPkgQOH?exists>${mktgPkgQOH}<#else> </#if></td> - <td> - <#if incomingShipmentAndItemList?has_content> - <#list incomingShipmentAndItemList as incomingShipmentAndItem> - <div>${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())?if_exists}-<#if incomingShipmentAndItem.quantity?exists>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> - </#list> - <#else> - <div> </div> - </#if> - </td> - <td> - <#if incomingProductionRunList?has_content> - <#list incomingProductionRunList as incomingProductionRun> - <div>${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())?if_exists}-<#if incomingProductionRun.estimatedQuantity?exists>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> - </#list> - <div><b>${uiLabelMap.CommonTotal}: ${incomingQuantityTotal?if_exists}</b></div> - <#else> - <div> </div> - </#if> - </td> - <td> - <#if outgoingProductionRunList?has_content> - <#list outgoingProductionRunList as outgoingProductionRun> - <div>${outgoingProductionRun.workEffortParentId?default("")}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())?if_exists}-<#if outgoingProductionRun.estimatedQuantity?exists>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> - </#list> - <div><b>${uiLabelMap.CommonTotal}: ${outgoingQuantityTotal?if_exists}</b></div> - <#else> - <div> </div> - </#if> - </td> - </tr> - </#if> - <#-- toggle the row color --> - <#if rowClass == "2"> - <#assign rowClass = "1"> - <#else> - <#assign rowClass = "2"> - </#if> - </#list> - </table> - </div> -</div> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductInventoryItems} ${uiLabelMap.CommonFor} <#if product?exists>${(product.internalName)?if_exists} </#if> [${uiLabelMap.CommonId}:${productId?if_exists}]</h3> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=682281&r1=682280&r2=682281&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Mon Aug 4 00:58:52 2008 @@ -1060,9 +1060,11 @@ <field name="orderItemSeqId"><display/></field> <field name="quantity"><display/></field> <field name="cancelQuantity"><display/></field> - <field name="itemStatusId"><display/></field> + <field name="itemStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> <field name="estimatedShipDate"><display/></field> <field name="estimatedDeliveryDate"><display/></field> + <field name="shipBeforeDate"><display/></field> + <field name="shipAfterDate"><display/></field> </form> <!-- create ProductMaint--> Added: ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl?rev=682281&view=auto ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl (added) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl Mon Aug 4 00:58:52 2008 @@ -0,0 +1,103 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you 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. +--> +<#if parameters.showAllFacilities?exists> +<a href="EditProductInventoryItems?productId=${productId}" class="buttontext">${uiLabelMap.ProductShowProductFacilities}</a> +<#else> +<a href="EditProductInventoryItems?productId=${productId}&showAllFacilities=Y" class="buttontext">${uiLabelMap.ProductShowAllFacilities}</a> +</#if> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.ProductInventorySummary}</h3> + </div> + <div class="screenlet-body"> + <table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td><b>${uiLabelMap.ProductFacility}</b></td> + <td><b>${uiLabelMap.ProductAtp}</b></td> + <td><b>${uiLabelMap.ProductQoh}</b></td> + <td><b>${uiLabelMap.ProductMarketingPackageATP}</b></td> + <td><b>${uiLabelMap.ProductMarketingPackageQOH}</b></td> + <td><b>${uiLabelMap.ProductIncomingShipments}</b></td> + <td><b>${uiLabelMap.ProductIncomingProductionRuns}</b></td> + <td><b>${uiLabelMap.ProductOutgoingProductionRuns}</b></td> + </tr> + <#assign rowClass = "2"> + <#list quantitySummaryByFacility.values() as quantitySummary> + <#if quantitySummary.facilityId?exists> + <#assign facilityId = quantitySummary.facilityId> + <#assign facility = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId))> + <#assign manufacturingInQuantitySummary = manufacturingInQuantitySummaryByFacility.get(facilityId)?if_exists> + <#assign manufacturingOutQuantitySummary = manufacturingOutQuantitySummaryByFacility.get(facilityId)?if_exists> + <#assign totalQuantityOnHand = quantitySummary.totalQuantityOnHand?if_exists> + <#assign totalAvailableToPromise = quantitySummary.totalAvailableToPromise?if_exists> + <#assign mktgPkgATP = quantitySummary.mktgPkgATP?if_exists> + <#assign mktgPkgQOH = quantitySummary.mktgPkgQOH?if_exists> + <#assign incomingShipmentAndItemList = quantitySummary.incomingShipmentAndItemList?if_exists> + <#assign incomingProductionRunList = manufacturingInQuantitySummary.incomingProductionRunList?if_exists> + <#assign incomingQuantityTotal = manufacturingInQuantitySummary.estimatedQuantityTotal?if_exists> + <#assign outgoingProductionRunList = manufacturingOutQuantitySummary.outgoingProductionRunList?if_exists> + <#assign outgoingQuantityTotal = manufacturingOutQuantitySummary.estimatedQuantityTotal?if_exists> + <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> + <td>${(facility.facilityName)?if_exists} [${facilityId?default("[No Facility]")}] + <a href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></td> + <td><#if totalAvailableToPromise?exists>${totalAvailableToPromise}<#else> </#if></td> + <td><#if totalQuantityOnHand?exists>${totalQuantityOnHand}<#else> </#if></td> + <td><#if mktgPkgATP?exists>${mktgPkgATP}<#else> </#if></td> + <td><#if mktgPkgQOH?exists>${mktgPkgQOH}<#else> </#if></td> + <td> + <#if incomingShipmentAndItemList?has_content> + <#list incomingShipmentAndItemList as incomingShipmentAndItem> + <div>${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())?if_exists}-<#if incomingShipmentAndItem.quantity?exists>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> + </#list> + <#else> + <div> </div> + </#if> + </td> + <td> + <#if incomingProductionRunList?has_content> + <#list incomingProductionRunList as incomingProductionRun> + <div>${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())?if_exists}-<#if incomingProductionRun.estimatedQuantity?exists>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> + </#list> + <div><b>${uiLabelMap.CommonTotal}: ${incomingQuantityTotal?if_exists}</b></div> + <#else> + <div> </div> + </#if> + </td> + <td> + <#if outgoingProductionRunList?has_content> + <#list outgoingProductionRunList as outgoingProductionRun> + <div>${outgoingProductionRun.workEffortParentId?default("")}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())?if_exists}-<#if outgoingProductionRun.estimatedQuantity?exists>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> + </#list> + <div><b>${uiLabelMap.CommonTotal}: ${outgoingQuantityTotal?if_exists}</b></div> + <#else> + <div> </div> + </#if> + </td> + </tr> + </#if> + <#-- toggle the row color --> + <#if rowClass == "2"> + <#assign rowClass = "1"> + <#else> + <#assign rowClass = "2"> + </#if> + </#list> + </table> + </div> +</div> Propchange: ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=682281&r1=682280&r2=682281&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Mon Aug 4 00:58:52 2008 @@ -861,7 +861,7 @@ </widgets> <fail-widgets> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/EditProductInventoryItems.ftl"/></html> + <html><html-template location="component://product/webapp/catalog/product/ProductInventorySummary.ftl"/></html> </platform-specific> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -877,6 +877,9 @@ </section> </container> </container> + <platform-specific> + <html><html-template location="component://product/webapp/catalog/product/EditProductInventoryItems.ftl"/></html> + </platform-specific> </fail-widgets> </section> </decorator-section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |