svn commit: r739654 - in /ofbiz/trunk/applications/manu
Locked
 
|
Author: mrisaliti
Date: Sat Jan 31 23:48:41 2009 New Revision: 739654 URL: http://svn.apache.org/viewvc?rev=739654&view=rev Log: Artifact cleaning on manufacturing component after recent changes on xsd files (OFBIZ-2137) Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=739654&r1=739653&r2=739654&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Sat Jan 31 23:48:41 2009 @@ -66,8 +66,8 @@ <form name="listFindProductionRun" list-name="listIt" title="" type="list" paginate-target="/FindProductionRun" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="requestParameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" value="WorkEffortAndGoods"/> </service> </actions> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml?rev=739654&r1=739653&r2=739654&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml Sat Jan 31 23:48:41 2009 @@ -33,9 +33,9 @@ <form name="listLookupRouting" list-name="listIt" title="" type="list" paginate-target="LookupRouting" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="requestParameters"/> - <field-map field-name="entityName" env-name="entityName"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="requestParameters"/> + <field-map field-name="entityName" from-field="entityName"/> </service> </actions> <field name="workEffortId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> @@ -66,9 +66,9 @@ <form name="listLookupRoutingTask" list-name="listIt" title="" type="list" paginate-target="LookupRoutingTask" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="requestParameters"/> - <field-map field-name="entityName" env-name="entityName"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="requestParameters"/> + <field-map field-name="entityName" from-field="entityName"/> </service> </actions> <field name="workEffortId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml?rev=739654&r1=739653&r2=739654&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml Sat Jan 31 23:48:41 2009 @@ -38,9 +38,9 @@ paginate-target="FindRouting" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="entityName" value="WorkEffort"/> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="requestParameters"/> - <field-map field-name="entityName" env-name="entityName"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="requestParameters"/> + <field-map field-name="entityName" from-field="entityName"/> </service> </actions> <field name="workEffortId" widget-style="buttontext" title="${uiLabelMap.ManufacturingRoutingId}"> @@ -89,9 +89,9 @@ paginate-target="FindRoutingTask" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="entityName" value="WorkEffort"/> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="requestParameters"/> - <field-map field-name="entityName" env-name="entityName"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="requestParameters"/> + <field-map field-name="entityName" from-field="entityName"/> </service> </actions> <field name="workEffortId" title="${uiLabelMap.ManufacturingTaskId}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=739654&r1=739653&r2=739654&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Sat Jan 31 23:48:41 2009 @@ -55,7 +55,7 @@ <!--<set field="labelTitleProperty" value="ProductProductBom"/>--> <set field="headerItem" value="bom"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/bom/EditProductBom.groovy"/> </actions> <widgets> @@ -78,8 +78,8 @@ <set field="headerItem" value="bom"/> <set field="ruleId" from-field="parameters.ruleId"/> - <entity-one entity-name="ProductManufacturingRule" value-name="manufacturingRule"/> - <entity-condition entity-name="ProductManufacturingRule" list-name="manufacturingRules"> + <entity-one entity-name="ProductManufacturingRule" value-field="manufacturingRule"/> + <entity-condition entity-name="ProductManufacturingRule" list="manufacturingRules"> <order-by field-name="ruleId"/> <order-by field-name="fromDate"/> </entity-condition> @@ -112,9 +112,9 @@ <set field="productFeatureApplTypeId" value="STANDARD_FEATURE"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> - <entity-and entity-name="ProductFeatureAndAppl" list-name="selectedFeatures"> - <field-map env-name="productId" field-name="productId"/> - <field-map env-name="productFeatureApplTypeId" field-name="productFeatureApplTypeId"/> + <entity-and entity-name="ProductFeatureAndAppl" list="selectedFeatures"> + <field-map from-field="productId" field-name="productId"/> + <field-map from-field="productFeatureApplTypeId" field-name="productFeatureApplTypeId"/> <order-by field-name="sequenceNum"/> </entity-and> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/bom/BomSimulation.groovy"/> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?rev=739654&r1=739653&r2=739654&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml Sat Jan 31 23:48:41 2009 @@ -81,7 +81,7 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <entity-condition list-name="techDataCalendars" entity-name="TechDataCalendar"/> + <entity-condition list="techDataCalendars" entity-name="TechDataCalendar"/> </actions> <widgets> <decorator-screen name="CommonCalendarDecorator"> @@ -117,7 +117,7 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <entity-condition list-name="calendarWeeks" entity-name="TechDataCalendarWeek"/> + <entity-condition list="calendarWeeks" entity-name="TechDataCalendarWeek"/> </actions> <widgets> <decorator-screen name="CommonCalendarDecorator"> @@ -151,7 +151,7 @@ <set field="tabButtonItem" value="CalendarWeek"/> <set field="headerItem" value="calendar"/> - <entity-one entity-name="TechDataCalendarWeek" value-name="calendarWeek"/> + <entity-one entity-name="TechDataCalendarWeek" value-field="calendarWeek"/> </actions> <widgets> <decorator-screen name="CommonCalendarDecorator"> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml?rev=739654&r1=739653&r2=739654&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml Sat Jan 31 23:48:41 2009 @@ -29,8 +29,8 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> - <entity-condition entity-name="CostComponentCalc" list-name="allCostComponentCalcs"/> - <entity-one entity-name="CostComponentCalc" value-name="costComponentCalc"/> + <entity-condition entity-name="CostComponentCalc" list="allCostComponentCalcs"/> + <entity-one entity-name="CostComponentCalc" value-field="costComponentCalc"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=739654&r1=739653&r2=739654&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Sat Jan 31 23:48:41 2009 @@ -37,7 +37,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="productionRun"/></not> + <not><if-empty field="productionRun"/></not> </condition> <widgets> <include-menu name="ProductionRunTabBar" location="component://manufacturing/widget/manufacturing/Menus.xml"/> @@ -222,7 +222,7 @@ <link target="PrintProductionRun?productionRunId=${productionRunId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/> <section> <condition> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_COMPLETED"/> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_COMPLETED"/> </condition> <widgets> <link target="changeProductionRunStatusToClosed?productionRunId=${productionRunId}" text="${uiLabelMap.ManufacturingProductionRunClose}" style="buttontext"/> @@ -231,9 +231,9 @@ <section> <condition> <and> - <if-compare field-name="productionRun.currentStatusId" operator="not-equals" value="PRUN_CANCELLED"/> - <if-compare field-name="productionRun.currentStatusId" operator="not-equals" value="PRUN_COMPLETED"/> - <if-compare field-name="productionRun.currentStatusId" operator="not-equals" value="PRUN_CLOSED"/> + <if-compare field="productionRun.currentStatusId" operator="not-equals" value="PRUN_CANCELLED"/> + <if-compare field="productionRun.currentStatusId" operator="not-equals" value="PRUN_COMPLETED"/> + <if-compare field="productionRun.currentStatusId" operator="not-equals" value="PRUN_CLOSED"/> </and> </condition> <widgets> @@ -261,7 +261,7 @@ </container> <section> <condition> - <if-compare field-name="canProduce" operator="equals" value="Y"/> + <if-compare field="canProduce" operator="equals" value="Y"/> </condition> <widgets> <container style="screenlet"> @@ -282,7 +282,7 @@ </section> <section> <condition> - <if-compare field-name="canDeclareAndProduce" operator="equals" value="Y"/> + <if-compare field="canDeclareAndProduce" operator="equals" value="Y"/> </condition> <widgets> <container style="screenlet"> @@ -449,20 +449,20 @@ <set field="headerItem" value="jobshop"/> <set field="productionRunId" from-field="parameters.productionRunId"/> - <entity-one entity-name="WorkEffort" value-name="productionRun"> - <field-map field-name="workEffortId" env-name="productionRunId"/> + <entity-one entity-name="WorkEffort" value-field="productionRun"> + <field-map field-name="workEffortId" from-field="productionRunId"/> </entity-one> <!-- Find all the work efforts that must be completed before this one. --> - <entity-condition entity-name="WorkEffortAssoc" list-name="mandatoryWorkEfforts"> + <entity-condition entity-name="WorkEffortAssoc" list="mandatoryWorkEfforts"> <condition-list> - <condition-expr field-name="workEffortIdTo" env-name="productionRunId"/> + <condition-expr field-name="workEffortIdTo" from-field="productionRunId"/> <condition-expr field-name="workEffortAssocTypeId" value="WORK_EFF_PRECEDENCY"/> </condition-list> </entity-condition> <!-- Find all the work efforts that are dependent from this one. --> - <entity-condition entity-name="WorkEffortAssoc" list-name="dependentWorkEfforts"> + <entity-condition entity-name="WorkEffortAssoc" list="dependentWorkEfforts"> <condition-list> - <condition-expr field-name="workEffortIdFrom" env-name="productionRunId"/> + <condition-expr field-name="workEffortIdFrom" from-field="productionRunId"/> <condition-expr field-name="workEffortAssocTypeId" value="WORK_EFF_PRECEDENCY"/> </condition-list> </entity-condition> @@ -513,12 +513,12 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="500"/> <set field="productionRunId" from-field="parameters.productionRunId"/> - <entity-one entity-name="WorkEffort" value-name="productionRun"> - <field-map field-name="workEffortId" env-name="productionRunId"/> + <entity-one entity-name="WorkEffort" value-field="productionRun"> + <field-map field-name="workEffortId" from-field="productionRunId"/> </entity-one> <set field="routingTaskId" from-field="parameters.routingTaskId"/> - <entity-one entity-name="WorkEffort" value-name="productionRunTask"> - <field-map field-name="workEffortId" env-name="routingTaskId"/> + <entity-one entity-name="WorkEffort" value-field="productionRunTask"> + <field-map field-name="workEffortId" from-field="routingTaskId"/> </entity-one> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunTasks.groovy"/> </actions> @@ -544,8 +544,8 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="500"/> <set field="productionRunId" from-field="parameters.productionRunId"/> - <entity-one entity-name="WorkEffort" value-name="productionRun"> - <field-map field-name="workEffortId" env-name="productionRunId"/> + <entity-one entity-name="WorkEffort" value-field="productionRun"> + <field-map field-name="workEffortId" from-field="productionRunId"/> </entity-one> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy"/> </actions> @@ -588,8 +588,8 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="500"/> <set field="productionRunId" from-field="parameters.productionRunId"/> - <entity-one entity-name="WorkEffort" value-name="productionRun"> - <field-map field-name="workEffortId" env-name="productionRunId"/> + <entity-one entity-name="WorkEffort" value-field="productionRun"> + <field-map field-name="workEffortId" from-field="productionRunId"/> </entity-one> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy"/> </actions> @@ -628,8 +628,8 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="500"/> <set field="productionRunId" from-field="parameters.productionRunId"/> - <entity-one entity-name="WorkEffort" value-name="productionRun"> - <field-map field-name="workEffortId" env-name="productionRunId"/> + <entity-one entity-name="WorkEffort" value-field="productionRun"> + <field-map field-name="workEffortId" from-field="productionRunId"/> </entity-one> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy"/> </actions> @@ -670,8 +670,8 @@ <set field="headerItem" value="jobshop"/> <set field="productionRunId" from-field="parameters.productionRunId"/> - <entity-one entity-name="WorkEffort" value-name="productionRun"> - <field-map field-name="workEffortId" env-name="productionRunId"/> + <entity-one entity-name="WorkEffort" value-field="productionRun"> + <field-map field-name="workEffortId" from-field="productionRunId"/> </entity-one> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy"/> </actions> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml?rev=739654&r1=739653&r2=739654&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml Sat Jan 31 23:48:41 2009 @@ -1,228 +1,228 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> - -<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - - <menu name="ManufacturingAppBar" title="${uiLabelMap.ManufacturingManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="jobshop" title="${uiLabelMap.ManufacturingJobShop}"> - <condition> - <if-has-permission permission="MANUFACTURING" action="_CREATE"/> - </condition> - <link target="FindProductionRun"/> - </menu-item> - <menu-item name="routing" title="${uiLabelMap.ManufacturingRouting}"> - <condition> - <if-has-permission permission="MANUFACTURING" action="_CREATE"/> - </condition> - <link target="FindRouting"/> - </menu-item> - <menu-item name="routingTask" title="${uiLabelMap.ManufacturingRoutingTask}"> - <condition> - <if-has-permission permission="MANUFACTURING" action="_CREATE"/> - </condition> - <link target="FindRoutingTask"/> - </menu-item> - <menu-item name="calendar" title="${uiLabelMap.ManufacturingCalendar}"> - <condition> - <if-has-permission permission="MANUFACTURING" action="_CREATE"/> - </condition> - <link target="FindCalendar"/> - </menu-item> - <menu-item name="costs" title="${uiLabelMap.ManufacturingCostCalcs}"> - <condition> - <if-has-permission permission="MANUFACTURING" action="_CREATE"/> - </condition> - <link target="EditCostCalcs"/> - </menu-item> - <menu-item name="bom" title="${uiLabelMap.ManufacturingBillOfMaterials}"> - <condition> - <if-has-permission permission="MANUFACTURING" action="_CREATE"/> - </condition> - <link target="FindBom"/> - </menu-item> - <menu-item name="mrp" title="${uiLabelMap.ManufacturingMrp}"> - <condition> - <if-has-permission permission="MANUFACTURING" action="_CREATE"/> - </condition> - <link target="FindInventoryEventPlan"/> - </menu-item> - <menu-item name="ShipmentPlans" title="${uiLabelMap.ManufacturingShipmentPlans}"> - <condition> - <if-has-permission permission="MANUFACTURING" action="_CREATE"/> - </condition> - <link target="WorkWithShipmentPlans"/> - </menu-item> - <menu-item name="ManufacturingReports" title="${uiLabelMap.ManufacturingReports}"> - <condition> - <if-has-permission permission="MANUFACTURING" action="_CREATE"/> - </condition> - <link target="ManufacturingReports"/> - </menu-item> - </menu> - - - <menu name="BomTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="findBom" title="${uiLabelMap.CommonFind}"> - <link target="FindBom"/> - </menu-item> - <menu-item name="bomSimulation" title="${uiLabelMap.ManufacturingBomSimulation}"> - <link target="BomSimulation"/> - </menu-item> - <menu-item name="EditProductBom" title="${uiLabelMap.ManufacturingEditProductBom}"> - <link target="EditProductBom"/> - </menu-item> - <menu-item name="productManufacturingRules" title="${uiLabelMap.ManufacturingManufacturingRules}"> - <link target="EditProductManufacturingRules"/> - </menu-item> - </menu> - - <menu name="ProductionRunTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="edit" title="${uiLabelMap.ManufacturingEditProductionRun}"> - <condition> - <or> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> - </or> - </condition> - <link target="EditProductionRun?productionRunId=${productionRunId}"/> - </menu-item> - <menu-item name="tasks" title="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"> - <condition> - <or> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> - </or> - </condition> - <link target="ProductionRunTasks?productionRunId=${productionRunId}"/> - </menu-item> - <menu-item name="components" title="${uiLabelMap.ManufacturingMaterials}"> - <condition> - <or> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> - </or> - </condition> - <link target="ProductionRunComponents?productionRunId=${productionRunId}"/> - </menu-item> - <menu-item name="fixedAssets" title="${uiLabelMap.AccountingFixedAssets}"> - <condition> - <or> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> - </or> - </condition> - <link target="ProductionRunFixedAssets?productionRunId=${productionRunId}"/> - </menu-item> - <menu-item name="declaration" title="${uiLabelMap.ManufacturingProductionRunDeclaration}"> - <condition> - <not> - <or> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> - </or> - </not> - </condition> - <link target="ProductionRunDeclaration?productionRunId=${productionRunId}"/> - </menu-item> - <menu-item name="actualComponents" title="${uiLabelMap.ManufacturingActualMaterials}"> - <condition> - <not> - <or> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> - <if-compare field-name="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> - </or> - </not> - </condition> - <link target="ProductionRunActualComponents?productionRunId=${productionRunId}"/> - </menu-item> - <menu-item name="assocs" title="${uiLabelMap.ManufacturingProductionRunAssocs}"> - <link target="ProductionRunAssocs?productionRunId=${productionRunId}"/> - </menu-item> - <menu-item name="costs" title="${uiLabelMap.ManufacturingActualCosts}"> - <link target="ProductionRunCosts?productionRunId=${productionRunId}"/> - </menu-item> - </menu> - - <menu name="MrpTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="RunMrp" title="${uiLabelMap.ManufacturingRunMrp}"> - <link target="RunMrp"/> - </menu-item> - <menu-item name="findInventoryEventPlan" title="${uiLabelMap.ManufacturingMrpLog}"> - <link target="FindInventoryEventPlan"/> - </menu-item> - </menu> - - <menu name="CalendarTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="Calendar" title="${uiLabelMap.ManufacturingCalendars}"> - <link target="FindCalendar"/> - </menu-item> - <menu-item name="CalendarWeek" title="${uiLabelMap.ManufacturingCalendarWeeks}"> - <link target="ListCalendarWeek"/> - </menu-item> - - <menu-item name="calendar" title="${uiLabelMap.CommonEdit}"> - <condition> - <not><if-empty field-name="techDataCalendar"/></not> - </condition> - <link target="EditCalendar?calendarId=${techDataCalendar.calendarId}"/> - </menu-item> - <menu-item name="calendarExceptionDay" title="${uiLabelMap.ManufacturingCalendarExceptionDate}"> - <condition> - <not><if-empty field-name="techDataCalendar"/></not> - </condition> - <link target="EditCalendarExceptionDay?calendarId=${techDataCalendar.calendarId}"/> - </menu-item> - <menu-item name="calendarExceptionWeek" title="${uiLabelMap.ManufacturingCalendarExceptionWeek}"> - <condition> - <not><if-empty field-name="techDataCalendar"/></not> - </condition> - <link target="EditCalendarExceptionWeek?calendarId=${techDataCalendar.calendarId}"/> - </menu-item> - </menu> - - <menu name="RoutingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="editRouting" title="${uiLabelMap.ManufacturingEditRouting}"> - <link target="EditRouting?workEffortId=${routing.workEffortId}"/> - </menu-item> - <menu-item name="routingTaskAssoc" title="${uiLabelMap.ManufacturingEditRoutingTaskAssoc}"> - <link target="EditRoutingTaskAssoc?workEffortId=${routing.workEffortId}"/> - </menu-item> - <menu-item name="routingProductLink" title="${uiLabelMap.ManufacturingEditRoutingProductLink}"> - <link target="EditRoutingProductLink?workEffortId=${routing.workEffortId}"/> - </menu-item> - </menu> - - <menu name="RoutingTaskTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="editRoutingTask" title="${uiLabelMap.ManufacturingEditRoutingTask}"> - <link target="EditRoutingTask?workEffortId=${routingTask.workEffortId}"/> - </menu-item> - <menu-item name="editRoutingTaskCosts" title="${uiLabelMap.ManufacturingListRoutings}"> - <link target="EditRoutingTaskCosts?workEffortId=${routingTask.workEffortId}"/> - </menu-item> - <menu-item name="listRoutingTaskProducts" title="${uiLabelMap.ManufacturingListProducts}"> - <link target="ListRoutingTaskProducts?workEffortId=${routingTask.workEffortId}"/> - </menu-item> - <menu-item name="editRoutingTaskFixedAssets" title="${uiLabelMap.ManufacturingRoutingTaskFixedAssets}"> - <link target="EditRoutingTaskFixedAssets?workEffortId=${routingTask.workEffortId}"/> - </menu-item> - </menu> - -</menus> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> + +<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> + + <menu name="ManufacturingAppBar" title="${uiLabelMap.ManufacturingManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="jobshop" title="${uiLabelMap.ManufacturingJobShop}"> + <condition> + <if-has-permission permission="MANUFACTURING" action="_CREATE"/> + </condition> + <link target="FindProductionRun"/> + </menu-item> + <menu-item name="routing" title="${uiLabelMap.ManufacturingRouting}"> + <condition> + <if-has-permission permission="MANUFACTURING" action="_CREATE"/> + </condition> + <link target="FindRouting"/> + </menu-item> + <menu-item name="routingTask" title="${uiLabelMap.ManufacturingRoutingTask}"> + <condition> + <if-has-permission permission="MANUFACTURING" action="_CREATE"/> + </condition> + <link target="FindRoutingTask"/> + </menu-item> + <menu-item name="calendar" title="${uiLabelMap.ManufacturingCalendar}"> + <condition> + <if-has-permission permission="MANUFACTURING" action="_CREATE"/> + </condition> + <link target="FindCalendar"/> + </menu-item> + <menu-item name="costs" title="${uiLabelMap.ManufacturingCostCalcs}"> + <condition> + <if-has-permission permission="MANUFACTURING" action="_CREATE"/> + </condition> + <link target="EditCostCalcs"/> + </menu-item> + <menu-item name="bom" title="${uiLabelMap.ManufacturingBillOfMaterials}"> + <condition> + <if-has-permission permission="MANUFACTURING" action="_CREATE"/> + </condition> + <link target="FindBom"/> + </menu-item> + <menu-item name="mrp" title="${uiLabelMap.ManufacturingMrp}"> + <condition> + <if-has-permission permission="MANUFACTURING" action="_CREATE"/> + </condition> + <link target="FindInventoryEventPlan"/> + </menu-item> + <menu-item name="ShipmentPlans" title="${uiLabelMap.ManufacturingShipmentPlans}"> + <condition> + <if-has-permission permission="MANUFACTURING" action="_CREATE"/> + </condition> + <link target="WorkWithShipmentPlans"/> + </menu-item> + <menu-item name="ManufacturingReports" title="${uiLabelMap.ManufacturingReports}"> + <condition> + <if-has-permission permission="MANUFACTURING" action="_CREATE"/> + </condition> + <link target="ManufacturingReports"/> + </menu-item> + </menu> + + + <menu name="BomTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="findBom" title="${uiLabelMap.CommonFind}"> + <link target="FindBom"/> + </menu-item> + <menu-item name="bomSimulation" title="${uiLabelMap.ManufacturingBomSimulation}"> + <link target="BomSimulation"/> + </menu-item> + <menu-item name="EditProductBom" title="${uiLabelMap.ManufacturingEditProductBom}"> + <link target="EditProductBom"/> + </menu-item> + <menu-item name="productManufacturingRules" title="${uiLabelMap.ManufacturingManufacturingRules}"> + <link target="EditProductManufacturingRules"/> + </menu-item> + </menu> + + <menu name="ProductionRunTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="edit" title="${uiLabelMap.ManufacturingEditProductionRun}"> + <condition> + <or> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> + </or> + </condition> + <link target="EditProductionRun?productionRunId=${productionRunId}"/> + </menu-item> + <menu-item name="tasks" title="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"> + <condition> + <or> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> + </or> + </condition> + <link target="ProductionRunTasks?productionRunId=${productionRunId}"/> + </menu-item> + <menu-item name="components" title="${uiLabelMap.ManufacturingMaterials}"> + <condition> + <or> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> + </or> + </condition> + <link target="ProductionRunComponents?productionRunId=${productionRunId}"/> + </menu-item> + <menu-item name="fixedAssets" title="${uiLabelMap.AccountingFixedAssets}"> + <condition> + <or> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> + </or> + </condition> + <link target="ProductionRunFixedAssets?productionRunId=${productionRunId}"/> + </menu-item> + <menu-item name="declaration" title="${uiLabelMap.ManufacturingProductionRunDeclaration}"> + <condition> + <not> + <or> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> + </or> + </not> + </condition> + <link target="ProductionRunDeclaration?productionRunId=${productionRunId}"/> + </menu-item> + <menu-item name="actualComponents" title="${uiLabelMap.ManufacturingActualMaterials}"> + <condition> + <not> + <or> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_CREATED"/> + <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> + </or> + </not> + </condition> + <link target="ProductionRunActualComponents?productionRunId=${productionRunId}"/> + </menu-item> + <menu-item name="assocs" title="${uiLabelMap.ManufacturingProductionRunAssocs}"> + <link target="ProductionRunAssocs?productionRunId=${productionRunId}"/> + </menu-item> + <menu-item name="costs" title="${uiLabelMap.ManufacturingActualCosts}"> + <link target="ProductionRunCosts?productionRunId=${productionRunId}"/> + </menu-item> + </menu> + + <menu name="MrpTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="RunMrp" title="${uiLabelMap.ManufacturingRunMrp}"> + <link target="RunMrp"/> + </menu-item> + <menu-item name="findInventoryEventPlan" title="${uiLabelMap.ManufacturingMrpLog}"> + <link target="FindInventoryEventPlan"/> + </menu-item> + </menu> + + <menu name="CalendarTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="Calendar" title="${uiLabelMap.ManufacturingCalendars}"> + <link target="FindCalendar"/> + </menu-item> + <menu-item name="CalendarWeek" title="${uiLabelMap.ManufacturingCalendarWeeks}"> + <link target="ListCalendarWeek"/> + </menu-item> + + <menu-item name="calendar" title="${uiLabelMap.CommonEdit}"> + <condition> + <not><if-empty field="techDataCalendar"/></not> + </condition> + <link target="EditCalendar?calendarId=${techDataCalendar.calendarId}"/> + </menu-item> + <menu-item name="calendarExceptionDay" title="${uiLabelMap.ManufacturingCalendarExceptionDate}"> + <condition> + <not><if-empty field="techDataCalendar"/></not> + </condition> + <link target="EditCalendarExceptionDay?calendarId=${techDataCalendar.calendarId}"/> + </menu-item> + <menu-item name="calendarExceptionWeek" title="${uiLabelMap.ManufacturingCalendarExceptionWeek}"> + <condition> + <not><if-empty field="techDataCalendar"/></not> + </condition> + <link target="EditCalendarExceptionWeek?calendarId=${techDataCalendar.calendarId}"/> + </menu-item> + </menu> + + <menu name="RoutingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="editRouting" title="${uiLabelMap.ManufacturingEditRouting}"> + <link target="EditRouting?workEffortId=${routing.workEffortId}"/> + </menu-item> + <menu-item name="routingTaskAssoc" title="${uiLabelMap.ManufacturingEditRoutingTaskAssoc}"> + <link target="EditRoutingTaskAssoc?workEffortId=${routing.workEffortId}"/> + </menu-item> + <menu-item name="routingProductLink" title="${uiLabelMap.ManufacturingEditRoutingProductLink}"> + <link target="EditRoutingProductLink?workEffortId=${routing.workEffortId}"/> + </menu-item> + </menu> + + <menu name="RoutingTaskTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="editRoutingTask" title="${uiLabelMap.ManufacturingEditRoutingTask}"> + <link target="EditRoutingTask?workEffortId=${routingTask.workEffortId}"/> + </menu-item> + <menu-item name="editRoutingTaskCosts" title="${uiLabelMap.ManufacturingListRoutings}"> + <link target="EditRoutingTaskCosts?workEffortId=${routingTask.workEffortId}"/> + </menu-item> + <menu-item name="listRoutingTaskProducts" title="${uiLabelMap.ManufacturingListProducts}"> + <link target="ListRoutingTaskProducts?workEffortId=${routingTask.workEffortId}"/> + </menu-item> + <menu-item name="editRoutingTaskFixedAssets" title="${uiLabelMap.ManufacturingRoutingTaskFixedAssets}"> + <link target="EditRoutingTaskFixedAssets?workEffortId=${routingTask.workEffortId}"/> + </menu-item> + </menu> + +</menus> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml?rev=739654&r1=739653&r2=739654&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml Sat Jan 31 23:48:41 2009 @@ -85,7 +85,7 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <entity-condition entity-name="JobSandbox" list-name="mrpActiveJobs"> + <entity-condition entity-name="JobSandbox" list="mrpActiveJobs"> <condition-list combine="and"> <condition-expr field-name="serviceName" value="executeMrp"/> <condition-list combine="or"> @@ -96,14 +96,14 @@ </condition-list> <order-by field-name="-createdStamp"/> </entity-condition> - <entity-condition entity-name="JobSandbox" list-name="mrpRunningJobs"> + <entity-condition entity-name="JobSandbox" list="mrpRunningJobs"> <condition-list combine="and"> <condition-expr field-name="serviceName" value="executeMrp"/> <condition-expr field-name="statusId" value="SERVICE_RUNNING"/> </condition-list> <order-by field-name="-createdStamp"/> </entity-condition> - <entity-condition entity-name="JobSandbox" list-name="lastFinishedJobs"> + <entity-condition entity-name="JobSandbox" list="lastFinishedJobs"> <condition-list combine="and"> <condition-expr field-name="serviceName" value="executeMrp"/> <condition-list combine="or"> @@ -151,7 +151,7 @@ </container> <section> <condition> - <if-empty field-name="mrpRunningJobs"/> + <if-empty field="mrpRunningJobs"/> </condition> <widgets> <platform-specific> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=739654&r1=739653&r2=739654&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Sat Jan 31 23:48:41 2009 @@ -112,7 +112,7 @@ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <entity-one entity-name="Shipment" value-name="shipment"/> + <entity-one entity-name="Shipment" value-field="shipment"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsByFeature.groovy"/> </actions> @@ -165,7 +165,7 @@ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <entity-one entity-name="Shipment" value-name="shipment"/> + <entity-one entity-name="Shipment" value-field="shipment"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy"/> </actions> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=739654&r1=739653&r2=739654&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Sat Jan 31 23:48:41 2009 @@ -26,7 +26,7 @@ <!-- <set field="leftbarScreenName" value="leftbar"/> --> <!-- <set field="leftbarScreenLocation" value=""/> --> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffort" value-name="routing"/> + <entity-one entity-name="WorkEffort" value-field="routing"/> </actions> <widgets> @@ -40,7 +40,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="routing"/></not> + <not><if-empty field="routing"/></not> </condition> <widgets> <include-menu name="RoutingTabBar" location="component://manufacturing/widget/manufacturing/Menus.xml"/> @@ -64,7 +64,7 @@ <section> <actions> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffort" value-name="routingTask"/> + <entity-one entity-name="WorkEffort" value-field="routingTask"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -77,7 +77,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="routing"/></not> + <not><if-empty field="routing"/></not> </condition> <widgets> <include-menu name="RoutingTaskTabBar" location="component://manufacturing/widget/manufacturing/Menus.xml"/> @@ -143,7 +143,7 @@ <set field="tabButtonItem" value="editRouting"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffort" value-name="routing"/> + <entity-one entity-name="WorkEffort" value-field="routing"/> </actions> <widgets> <decorator-screen name="CommonRoutingDecorator"> @@ -213,7 +213,7 @@ <set field="tabButtonItem" value="editRoutingTask"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffort" value-name="routingTask"/> + <entity-one entity-name="WorkEffort" value-field="routingTask"/> </actions> <widgets> <decorator-screen name="CommonRoutingTaskDecorator"> @@ -248,9 +248,9 @@ <set field="tabButtonItem" value="editRoutingTaskCosts"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffort" value-name="routingTask"/> - <entity-and entity-name="WorkEffortCostCalc" list-name="allCosts"> - <field-map field-name="workEffortId" env-name="workEffortId"/> + <entity-one entity-name="WorkEffort" value-field="routingTask"/> + <entity-and entity-name="WorkEffortCostCalc" list="allCosts"> + <field-map field-name="workEffortId" from-field="workEffortId"/> </entity-and> </actions> <widgets> @@ -273,9 +273,9 @@ <set field="tabButtonItem" value="listRoutingTaskRoutings"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffort" value-name="routingTask"/> - <entity-and entity-name="WorkEffortAssoc" list-name="allRoutings"> - <field-map env-name="workEffortId" field-name="workEffortIdTo"/> + <entity-one entity-name="WorkEffort" value-field="routingTask"/> + <entity-and entity-name="WorkEffortAssoc" list="allRoutings"> + <field-map from-field="workEffortId" field-name="workEffortIdTo"/> </entity-and> </actions> <widgets> @@ -308,10 +308,10 @@ <set field="tabButtonItem" value="listRoutingTaskProducts"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffort" value-name="routingTask"/> - <entity-and entity-name="WorkEffortGoodStandard" list-name="allProducts"> + <entity-one entity-name="WorkEffort" value-field="routingTask"/> + <entity-and entity-name="WorkEffortGoodStandard" list="allProducts"> <field-map field-name="workEffortGoodStdTypeId" value="PRUNT_PROD_DELIV"/> - <field-map env-name="workEffortId" field-name="workEffortId"/> + <field-map from-field="workEffortId" field-name="workEffortId"/> </entity-and> </actions> <widgets> @@ -334,11 +334,11 @@ <set field="tabButtonItem" value="listRoutingTaskProducts"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-and entity-name="WorkEffortGoodStandard" list-name="allRoutingProductLinks"> - <field-map env-name="workEffortId" field-name="workEffortId"/> + <entity-and entity-name="WorkEffortGoodStandard" list="allRoutingProductLinks"> + <field-map from-field="workEffortId" field-name="workEffortId"/> <field-map field-name="workEffortGoodStdTypeId" value="PRUNT_PROD_DELIV"/> </entity-and> - <entity-one entity-name="WorkEffortGoodStandard" value-name="routingProductLink" auto-field-map="true"/> + <entity-one entity-name="WorkEffortGoodStandard" value-field="routingProductLink" auto-field-map="true"/> </actions> <widgets> <decorator-screen name="CommonRoutingTaskDecorator"> @@ -371,9 +371,9 @@ <set field="workEffortId" from-field="parameters.workEffortId"/> <set field="workEffortAssocTypeId" value="ROUTING_COMPONENT"/> - <entity-and entity-name="WorkEffortAssocView" list-name="allRoutingTasks"> - <field-map env-name="workEffortId" field-name="workEffortIdFrom"/> - <field-map env-name="workEffortAssocTypeId" field-name="workEffortAssocTypeId"/> + <entity-and entity-name="WorkEffortAssocView" list="allRoutingTasks"> + <field-map from-field="workEffortId" field-name="workEffortIdFrom"/> + <field-map from-field="workEffortAssocTypeId" field-name="workEffortAssocTypeId"/> <order-by field-name="sequenceNum"/> <order-by field-name="fromDate"/> </entity-and> @@ -426,12 +426,12 @@ <set field="workEffortGoodStdTypeId" value="ROU_PROD_TEMPLATE"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <!--<entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>--> - <entity-and entity-name="WorkEffortGoodStandard" list-name="allRoutingProductLinks"> - <field-map env-name="workEffortId" field-name="workEffortId"/> - <field-map env-name="workEffortGoodStdTypeId" field-name="workEffortGoodStdTypeId"/> + <!--<entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>--> + <entity-and entity-name="WorkEffortGoodStandard" list="allRoutingProductLinks"> + <field-map from-field="workEffortId" field-name="workEffortId"/> + <field-map from-field="workEffortGoodStdTypeId" field-name="workEffortGoodStdTypeId"/> </entity-and> - <entity-one entity-name="WorkEffortGoodStandard" value-name="routingProductLink" auto-field-map="true"/> + <entity-one entity-name="WorkEffortGoodStandard" value-field="routingProductLink" auto-field-map="true"/> <!--<script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditRoutingProductLink.groovy"/>--> </actions> <widgets> @@ -453,8 +453,8 @@ <set field="tabButtonItem" value="editRoutingTaskFixedAssets" /> <set field="headerItem" value="routingTask" /> <set field="workEffortId" from-field="parameters.workEffortId" /> - <entity-and entity-name="WorkEffortFixedAssetStd" list-name="allFixedAssets"> - <field-map field-name="workEffortId" env-name="workEffortId" /> + <entity-and entity-name="WorkEffortFixedAssetStd" list="allFixedAssets"> + <field-map field-name="workEffortId" from-field="workEffortId" /> </entity-and> </actions> <widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |