svn commit: r510920 - in /ofbiz/trunk: applications/product/script/or
Locked
svn commit: r510920 - in /ofbiz/trunk: applications/product/script/or
 
|
Author: lektran
Date: Fri Feb 23 04:05:39 2007 New Revision: 510920 URL: http://svn.apache.org/viewvc?view=rev&rev=510920 Log: Applied patch from Anil Patel OFBIZ-739 with a few clean-ups/corrections, implements returning parts issued to a fixed asset maintenance and also improves the services for issuing parts. A couple of other clean-ups included: Corrected javascript includes due to OFBIZ-740 Corrected spelling of issuence to issuance Added: ofbiz/trunk/specialpurpose/assetmaint/servicedef/ ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml (with props) ofbiz/trunk/specialpurpose/assetmaint/src/ ofbiz/trunk/specialpurpose/assetmaint/src/org/ ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/ ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/ ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java (with props) Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml ofbiz/trunk/applications/product/servicedef/services_shipment.xml ofbiz/trunk/specialpurpose/assetmaint/build.xml ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?view=diff&rev=510920&r1=510919&r2=510920 ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Fri Feb 23 04:05:39 2007 @@ -387,4 +387,27 @@ </calculate> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> </simple-method> + + <simple-method method-name="returnInventoryItemIssuedToFixedAssetMaint" short-description="Return the InventoryItem Issued To FixedAssetMaint"> + <entity-one entity-name="ItemIssuance" value-name="itemIssuance"/> + <set field="oldQuantity" from-field="itemIssuance.quantity"/> + <!-- Update the ItemIssuance --> + <set value="0" field="itemIssuanceUpdate.quantity" type="Double" /> + <set from-field="parameters.itemIssuanceId" field="itemIssuanceUpdate.itemIssuanceId"/> + <call-service service-name="updateItemIssuance" in-map-name="itemIssuanceUpdate"/> + <!-- Increment InventoryItem quantityOnHand AND availableToPromise since there was no reservation --> + <!-- instead of updating InventoryItem, add an InventoryItemDetail --> + <set from-field="itemIssuance.inventoryItemId" field="createDetailMap.inventoryItemId"/> + <set from-field="itemIssuance.fixedAssetId" field="createDetailMap.fixedAssetId"/> + <set from-field="itemIssuance.maintHistSeqId" field="createDetailMap.maintHistSeqId"/> + <set from-field="itemIssuance.itemIssuanceId" field="createDetailMap.itemIssuanceId"/> + <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double"> + <calcop field-name="oldQuantity" operator="add"/> + </calculate> + <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double"> + <calcop field-name="oldQuantity" operator="add"/> + </calculate> + <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> + </simple-method> + </simple-methods> Modified: ofbiz/trunk/applications/product/servicedef/services_shipment.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_shipment.xml?view=diff&rev=510920&r1=510919&r2=510920 ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services_shipment.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services_shipment.xml Fri Feb 23 04:05:39 2007 @@ -363,6 +363,11 @@ <attribute name="quantity" type="Double" mode="IN" optional="false"/> <attribute name="itemIssuanceId" type="String" mode="OUT" optional="false"/> </service> + <service name="returnInventoryItemIssuedToFixedAssetMaint" engine="simple" + location="org/ofbiz/shipment/issuance/IssuanceServices.xml" invoke="returnInventoryItemIssuedToFixedAssetMaint" auth="true"> + <description>Return InventoryItem Issued to a FixedAssetMaint - for conversion to use as supples/parts</description> + <attribute name="itemIssuanceId" type="String" mode="IN" optional="false"/> + </service> <!-- Pack Order Services --> <service name="packSingleItem" engine="java" Modified: ofbiz/trunk/specialpurpose/assetmaint/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/build.xml?view=diff&rev=510920&r1=510919&r2=510920 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/build.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/build.xml Fri Feb 23 04:05:39 2007 @@ -84,7 +84,6 @@ <!-- ================================================================== --> <target name="classes" depends="prepare,classpath"> - <!-- TODO: uncomment once there is actually a src directory <javac debug="on" source="1.4" deprecation="on" destdir="${build.dir}/classes"> <classpath> <path refid="local.class.path"/> @@ -94,7 +93,6 @@ <copy todir="${build.dir}/classes"> <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> </copy> - --> </target> <target name="jar" depends="classes"> Modified: ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties?view=diff&rev=510920&r1=510919&r2=510920 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties (original) +++ ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties Fri Feb 23 04:05:39 2007 @@ -36,7 +36,8 @@ PageTitleEditWorkEffort=Edit Task PageTitleChildWorkEfforts=Task Breakdown -PageTitleListItemIssuence=Parts List +PageTitleListItemIssuance=Parts List +PageTitleAddItemIssuance=Add Item Issuance # Override UiLabels defined in accounting component. Give them more specialized Labels. AccountingNewFixedAsset=New Equipment @@ -78,7 +79,10 @@ WorkEffortWorkEffortPurposeTypeId=Purpose FixedAssetMaintWorkEffortName=Maintenance of Equipment -FixedAssetMaintItemIssuence=Parts +FixedAssetMaintItemIssuance=Parts AccountingFixedAssetIdRequiredError=Equipment Id is required field, Please enter and try again. AccountingFixedAssetIdInvalidError=Equipment Id is invalid. Please use Equipment lookup tool to find valid Equipment Id + +AssetMaintInvalidPartProductIdError="Part Id ${productId} provided is invalid please check and try again" +AssetMaintLowPartInventoryError="Available Inventory level for ${productId} is ${quantity}" Modified: ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml?view=diff&rev=510920&r1=510919&r2=510920 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml Fri Feb 23 04:05:39 2007 @@ -35,6 +35,10 @@ <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup.xml"/> + <!-- service resources: model(s), eca(s) and group definitions --> + <service-resource type="model" loader="main" location="servicedef/services.xml"/> + + <webapp name="assetmaint" title="AssetMaint" server="default-server" Added: ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml?view=auto&rev=510920 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml (added) +++ ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml Fri Feb 23 04:05:39 2007 @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> + +<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd"> + <description>Assetmaint Services: Fixed Asset </description> + <vendor>OFBiz</vendor> + <version>1.0</version> + + <service name="addPartFixedAssetMaint" engine="java" + location="org.ofbiz.assetmaint.FixedAssetMaintServices" invoke="addPartFixedAssetMaint" auth="true"> + <description>Add Part item to a FixedAssetMaint</description> + <attribute type="String" mode="IN" name="fixedAssetId" optional="false"/> + <attribute type="String" mode="IN" name="maintHistSeqId" optional="false"/> + <attribute type="Double" mode="IN" name="quantity" optional="false"/> + <attribute type="String" mode="IN" name="productId" optional="false"/> + <attribute type="String" mode="IN" name="facilityId" optional="false"/> + </service> + +</services> Propchange: ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/assetmaint/servicedef/services.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java?view=auto&rev=510920 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java (added) +++ ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java Fri Feb 23 04:05:39 2007 @@ -0,0 +1,117 @@ +package org.ofbiz.assetmaint; + +/** +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. +**/ + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilProperties; +import org.ofbiz.entity.condition.EntityExpr; +import org.ofbiz.entity.condition.EntityOperator; +import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.GenericEntityException; +import org.ofbiz.entity.GenericValue; +import org.ofbiz.product.product.ProductWorker; +import org.ofbiz.service.DispatchContext; +import org.ofbiz.service.GenericServiceException; +import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.service.ServiceUtil; + +public class FixedAssetMaintServices { + + public static final String module = FixedAssetMaintServices.class.getName(); + + public static Map addPartFixedAssetMaint(DispatchContext ctx, Map context) { + LocalDispatcher dispatcher = ctx.getDispatcher(); + GenericDelegator delegator = ctx.getDelegator(); + Locale locale = (Locale) context.get("locale"); + String fixedAssetId = (String)context.get("fixedAssetId"); + String maintHistSeqId = (String)context.get("maintHistSeqId"); + String productId = (String)context.get("productId"); + String facilityId = (String)context.get("facilityId"); + Double quantity = (Double)context.get("quantity"); + double requestedQty = quantity.doubleValue(); + + try { + GenericValue product = ProductWorker.findProduct(delegator, productId); + if (product == null) { + return ServiceUtil.returnError + (UtilProperties.getMessage("AssetMaintUiLabels","AssetMaintInvalidPartProductIdError", UtilMisc.toMap("productId", productId), locale)); + } + Map findCurrInventoryParams = UtilMisc.toMap("productId", productId, "facilityId", facilityId); + GenericValue userLogin = (GenericValue) context.get("userLogin"); + // Call issuance service + Map result = dispatcher.runSync("getInventoryAvailableByFacility", findCurrInventoryParams); + if (ServiceUtil.isError(result)) { + return ServiceUtil.returnError("Problem in getting Inventory level for " + productId , null, null, result); + } + Object atpObj = result.get("availableToPromiseTotal"); + double atp = 0.0; + if (atpObj != null) { + atp = Double.parseDouble(atpObj.toString()); + } + if (requestedQty > atp) { + return ServiceUtil.returnError + (UtilProperties.getMessage("AssetMaintUiLabels","AssetMaintLowPartInventoryError",UtilMisc.toMap("productId", productId , "quantity", Double.toString(atp)), locale)); + } + List inventoryItems = delegator.findByAnd("InventoryItem", UtilMisc.toList( + new EntityExpr("productId", EntityOperator.EQUALS, productId), + new EntityExpr("facilityId", EntityOperator.EQUALS, facilityId), + new EntityExpr("availableToPromiseTotal", EntityOperator.GREATER_THAN, "0"))); //&& inventoryItems.size() > 0 + Iterator itr = inventoryItems.iterator(); + while (requestedQty > 0 && itr.hasNext()) { + GenericValue inventoryItem = (GenericValue)itr.next(); + String inventoryItemId = inventoryItem.getString("inventoryItemId"); + atp = inventoryItem.getDouble("availableToPromiseTotal").doubleValue(); + findCurrInventoryParams = UtilMisc.toMap("inventoryItemId",inventoryItemId); + Double issueQuantity = null; + if (requestedQty > atp) { + issueQuantity = new Double(atp); + } else { + issueQuantity = new Double(requestedQty); + } + Map itemIssuanceCtx = new HashMap(); + itemIssuanceCtx.put("userLogin", userLogin); + itemIssuanceCtx.put("inventoryItemId", inventoryItemId); + itemIssuanceCtx.put("fixedAssetId", fixedAssetId); + itemIssuanceCtx.put("maintHistSeqId", maintHistSeqId); + itemIssuanceCtx.put("quantity", issueQuantity); + // Call issuance service + result = dispatcher.runSync("issueInventoryItemToFixedAssetMaint",itemIssuanceCtx); + if (ServiceUtil.isError(result)) { + return ServiceUtil.returnError("Problem in calling service issueInventoryItemToFixedAssetMaint", null, null, result); + } + requestedQty = requestedQty - issueQuantity.doubleValue(); + } + } catch (GenericEntityException e) { + Debug.logError("Problem in retriving data from database", module); + } catch (GenericServiceException e) { + String msg = "Problem in calling service issueInventoryItemToFixedAssetMaint"; + Debug.logError(msg, module); + return ServiceUtil.returnError(msg); + } + return ServiceUtil.returnSuccess(); + } +} Propchange: ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml?view=diff&rev=510920&r1=510919&r2=510920 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml Fri Feb 23 04:05:39 2007 @@ -136,16 +136,22 @@ <response name="success" type="view" value="EditWorkEfforts"/> <response name="error" type="view" value="EditWorkEfforts"/> </request-map> - <request-map uri="EditItemIssuences"> + <request-map uri="EditItemIssuances"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditItemIssuences"/> - <response name="error" type="view" value="EditItemIssuences"/> + <response name="success" type="view" value="EditItemIssuances"/> + <response name="error" type="view" value="EditItemIssuances"/> </request-map> <request-map uri="issueInventoryItemToFixedAssetMaint"> <security https="true" auth="true"/> - <event type="service" invoke="issueInventoryItemToFixedAssetMaint"/> - <response name="success" type="view" value="EditItemIssuences"/> - <response name="error" type="view" value="EditItemIssuences"/> + <event type="service" invoke="addPartFixedAssetMaint"/> + <response name="success" type="view" value="EditItemIssuances"/> + <response name="error" type="view" value="EditItemIssuances"/> + </request-map> + <request-map uri="returnPartIssuedToFixedAssetMaint"> + <security https="true" auth="true"/> + <event type="service" invoke="returnInventoryItemIssuedToFixedAssetMaint"/> + <response name="success" type="view" value="EditItemIssuances"/> + <response name="error" type="view" value="EditItemIssuances"/> </request-map> <!-- ================ Lookup Requests ================= --> @@ -185,7 +191,7 @@ <view-map name="EditWorkEfforts" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditWorkEfforts"/> <view-map name="EditWorkEffortTimeEntries" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditWorkEffortTimeEntries"/> <view-map name="EditWorkEffortNotes" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditWorkEffortNotes"/> - <view-map name="EditItemIssuences" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditItemIssuences"/> + <view-map name="EditItemIssuances" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditItemIssuances"/> <!-- Lookup request mappings --> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?view=diff&rev=510920&r1=510919&r2=510920 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Fri Feb 23 04:05:39 2007 @@ -190,25 +190,27 @@ </section> </screen> - <screen name="EditItemIssuences"> + <screen name="EditItemIssuances"> <section> <actions> - <set field="titleProperty" value="PageTitleListItemIssuence"/> - <set field="tabButtonItem" value="EditItemIssuences"/> - <set field="labelTitleProperty" value="PageTitleListItemIssuence"/> + <set field="titleProperty" value="PageTitleListItemIssuance"/> + <set field="tabButtonItem" value="EditItemIssuances"/> + <set field="labelTitleProperty" value="PageTitleListItemIssuance"/> <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> <set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/> <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> - <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/> + <entity-condition list-name="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance"> + <condition-expr field-name="quantity" operator="greater" value="0"/> + </entity-condition> </actions> <widgets> <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleListItemIssuence}</label></container> - <include-form name="ListItemIssuence" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> - <container><label style="head1">${uiLabelMap.PageTitleAddItemIssuence}</label></container> - <include-form name="AddItemIssuence" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> + <container><label style="head1">${uiLabelMap.PageTitleListItemIssuance}</label></container> + <include-form name="ListItemIssuance" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> + <container><label style="head1">${uiLabelMap.PageTitleAddItemIssuance}</label></container> + <include-form name="AddItemIssuance" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?view=diff&rev=510920&r1=510919&r2=510920 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Fri Feb 23 04:05:39 2007 @@ -33,7 +33,10 @@ <!-- The two default (global) stylesheets are added to the list of stylesheets to the first and second position --> <set field="layoutSettings.styleSheets[+0]" value="/images/maincss.css" global="true"/> - <set field="layoutSettings.styleSheets[+1]" value="/images/tabstyles.css" global="true"/> + <!-- The default (global) java scripts --> + <set field="layoutSettings.javaScripts[]" value="/images/calendar1.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.AssetMaintCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.AssetMaintCompanySubtitle" global="true"/> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?view=diff&rev=510920&r1=510919&r2=510920 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Fri Feb 23 04:05:39 2007 @@ -63,8 +63,8 @@ <menu-item name="EditWorkEffortNotes" title="${uiLabelMap.WorkEffortNotes}"> <link target="EditWorkEffortNotes?fixedAssetId=${fixedAssetMaint.fixedAssetId}&maintHistSeqId=${fixedAssetMaint.maintHistSeqId}&workEffortId=${fixedAssetMaint.scheduleWorkEffortId}"/> </menu-item> - <menu-item name="EditItemIssuences" title="${uiLabelMap.FixedAssetMaintItemIssuence}"> - <link target="EditItemIssuences?fixedAssetId=${fixedAssetMaint.fixedAssetId}&maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/> + <menu-item name="EditItemIssuances" title="${uiLabelMap.FixedAssetMaintItemIssuance}"> + <link target="EditItemIssuances?fixedAssetId=${fixedAssetMaint.fixedAssetId}&maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/> </menu-item> </menu> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?view=diff&rev=510920&r1=510919&r2=510920 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Fri Feb 23 04:05:39 2007 @@ -212,23 +212,33 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="AddItemIssuence" target="issueInventoryItemToFixedAssetMaint" title="PageTitleFixedAssetMaintItemIssuence" default-map-name="newIssuenceTtem" type="single" + <form name="AddItemIssuance" target="issueInventoryItemToFixedAssetMaint" title="PageTitleFixedAssetMaintItemIssuance" default-map-name="newIssuanceItem" type="single" default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + <field name="facilityId"> + <drop-down> + <entity-options description="${description}" entity-name="Facility"> + <entity-constraint name="facilityTypeId" value="WAREHOUSE"/> + <entity-order-by field-name="facilityId"/> + </entity-options> + </drop-down> + </field> <field name="productId" title="Part Id*" required-field="true"><lookup target-form-name="LookupPartsProduct"/></field> <field name="quantity" position="1" title="${uiLabelMap.CommonQuantity}*"><text size="10"/></field> <field name="maintHistSeqId"><hidden/></field> <field name="fixedAssetId"><hidden/></field> - <field name="facilityId"><hidden value="WebStoreWarehouse" /></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListItemIssuence" title="PageTitleFixedAssetMaintItemIssuence" type="list" list-name="itemIssuenceList" - default-title-style="viewOneTR1" default-tooltip-style="tabletext" default-widget-style="tabletext" header-row-style="boxtop" - default-table-style="boxoutside" even-row-style="viewManyTR2" odd-row-style="viewManyTR1" separate-columns="true" > + <form name="ListItemIssuance" title="PageTitleFixedAssetMaintItemIssuance" type="list" list-name="itemIssuanceList" + default-title-style="boxhead" default-tooltip-style="tabletext" default-widget-style="tabletext" default-table-style="boxoutside" + header-row-style="boxtop" even-row-style="viewManyTR2" odd-row-style="viewManyTR1"> <field name="productId" title="Part Id"><display/></field> <field name="quantity" position="1" title="${uiLabelMap.CommonQuantity}"><display/></field> <field name="productName" position="1" title="${uiLabelMap.CommonName}"><display/></field> <field name="comments" position="1" title="${uiLabelMap.CommonComments}"><display/></field> <field name="description" position="1" title="${uiLabelMap.CommonDescription}"><display/></field> + <field name="returnPart" title="" widget-style="linktext"> + <hyperlink description="${uiLabelMap.CommonReturn}" target="returnPartIssuedToFixedAssetMaint?itemIssuanceId=${itemIssuanceId}&fixedAssetId=${fixedAssetId}&maintHistSeqId=${maintHistSeqId}"/> + </field> </form> </forms> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml?view=diff&rev=510920&r1=510919&r2=510920 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Fri Feb 23 04:05:39 2007 @@ -84,7 +84,6 @@ <field name="productId" title="${uiLabelMap.CommonId}"><text-find default-option="contains" ignore-case="true"/></field> <field name="brandName" title="${uiLabelMap.ProductBrandName}"><text-find default-option="contains" ignore-case="true"/></field> <field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find default-option="contains" ignore-case="true"/></field> - <field name="primaryProductCategoryId"><hidden/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <!-- <field name="isVariant"><hidden value="N"/></field> --> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |