[OFBiz] SVN: r4804 - in
trunk/applications/manufacturing/webapp/manufacturing:
jobshopmgt lookup mrp requirement routing
jacopo at svn.ofbiz.org
jacopo at svn.ofbiz.org
Sat Apr 9 06:01:00 EDT 2005
Author: jacopo
Date: 2005-04-09 05:00:31 -0500 (Sat, 09 Apr 2005)
New Revision: 4804
Modified:
trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml
trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml
trunk/applications/manufacturing/webapp/manufacturing/requirement/RequirementForms.xml
trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml
trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
Log:
In a lot of form definitions, uiLabelMap was set inside the action tags. This was not correct. Thanks to Adrian Crum that submitted the patch (OFBIZ-174).
Modified: trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml 2005-04-09 09:47:41 UTC (rev 4803)
+++ trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml 2005-04-09 10:00:31 UTC (rev 4804)
@@ -29,9 +29,6 @@
<form name="findProductionRun"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
target="FindProductionRun" title="" type="single">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="hideSearch"><hidden value="Y"/></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingProductionRunId}"><text-find/></field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
@@ -64,7 +61,6 @@
list-iterator-name="listIt" paginate-target="/FindProductionRun"
title="" type="list">
<actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
<set field="entityName" value="WorkEffortAndGoods"/>
<service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
<field-map field-name="inputFields" env-name="requestParameters"/>
@@ -89,9 +85,6 @@
<form name="UpdateProductionRun" type="single"
target="EditProductionRun" title="" default-map-name="productionRunData"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="actionForm"><hidden value="${actionForm}"/></field>
<field name="productionRunId"><hidden/></field>
<field name="productId" title="${uiLabelMap.ProductProductId}">
@@ -108,9 +101,6 @@
<form name="ListProductionRunRoutingTasks" type="list"
target="EditProductionRun" title="" list-name="productionRunRoutingTasks"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="priority" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}"><display description="${workEffortName} [${workEffortId}]" /></field>
<field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><display/></field>
@@ -129,9 +119,6 @@
<form name="ListProductionRunComponents" type="list"
target="EditProductionRun" title="" list-name="productionRunComponentsData"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingTaskId}">
<display description="${workEffortName} [${workEffortId}]"/>
</field>
@@ -151,9 +138,6 @@
<form name="EditProductionRunRoutingTask" type="single"
target="EditProductionRun" title="" default-map-name="routingTaskData"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="actionForm">
<hidden value="${actionForm}"/>
</field>
@@ -195,9 +179,6 @@
<form name="EditProductionRunComponent" type="single"
target="EditProductionRun" title="" default-map-name="productComponentData"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="actionForm">
<hidden value="${actionForm}"/>
</field>
@@ -238,9 +219,6 @@
<form name="ShowProductionRun" type="single"
target="productionRunProduce" title="" default-map-name="productionRunData"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="productionRunId"><hidden/></field>
<field name="productId" title="${uiLabelMap.ProductProductId}">
<display description="[${productionRunData.productId}]/${productionRunData.productName}"/>
@@ -279,9 +257,6 @@
<form name="ListProductionRunDeclRoutingTasks" type="list"
target="ProductionRunDeclaration" title="" list-name="productionRunRoutingTasks"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="actionForm"><hidden value="EditRoutingTask"/></field>
<field name="productionRunId"><hidden value="${workEffortParentId}"/></field>
<field name="routingTaskId"><hidden value="${workEffortId}"/></field>
@@ -310,9 +285,6 @@
<form name="ListProductionRunDeclComponents" type="list"
target="ProductionRunDeclaration" title="" list-name="productionRunComponentsData"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="actionForm"><hidden value="EditProductComponent"/></field>
<field name="productionRunId"><hidden/></field>
<field name="productId" ><hidden/></field>
@@ -329,9 +301,6 @@
<form name="EditProductionRunDeclRoutingTask" type="single"
target="updateProductionRunTask" title="" default-map-name="routingTaskData"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="actionForm">
<hidden value="${actionForm}"/>
</field>
@@ -410,9 +379,6 @@
<form name="listShipmentPlan" type="list"
target="" title="" list-name="shipmentPlan"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="orderId" title="${uiLabelMap.ProductOrderId}"><display/></field>
<field name="orderItemSeqId" title="${uiLabelMap.ProductOrderItem}"><display/></field>
<field name="productId" title="${uiLabelMap.ProductProductId}"><display/></field>
@@ -434,9 +400,6 @@
<form name="listShipmentPlans" type="list"
target="" title="" list-name="shipmentPlans"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="shipmentId" title="${uiLabelMap.ProductShipmentId}"><display/></field>
<field name="statusId" title="${uiLabelMap.ProductShipmentStatusId}">
<display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
Modified: trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml 2005-04-09 09:47:41 UTC (rev 4803)
+++ trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml 2005-04-09 10:00:31 UTC (rev 4804)
@@ -29,9 +29,6 @@
<form name="lookupRouting"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
target="LookupRouting" title="" type="single">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<auto-fields-service service-name="lookupRoutingTask" default-field-type="hidden"/>
<field name="workEffortName"><text-find default-value="equals"/></field>
<field name="workEffortTypeId"><hidden value="ROUTING"/></field>
@@ -48,7 +45,6 @@
list-name="entityList" paginate-target="LookupRouting"
title="" type="list">
<actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
<service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
<field-map field-name="inputFields" env-name="requestParameters"/>
<field-map field-name="entityName" env-name="entityName"/>
@@ -65,9 +61,6 @@
<form name="lookupRoutingTask"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
target="LookupRoutingTask" title="" type="single">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<auto-fields-service service-name="lookupRoutingTask" default-field-type="find"/>
<field name="workEffortTypeId"><hidden value="ROU_TASK"/></field>
<field name="fixedAssetId" >
@@ -89,7 +82,6 @@
list-name="entityList" paginate-target="LookupRoutingTask"
title="" type="list">
<actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
<service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
<field-map field-name="inputFields" env-name="requestParameters"/>
<field-map field-name="entityName" env-name="entityName"/>
Modified: trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml 2005-04-09 09:47:41 UTC (rev 4803)
+++ trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml 2005-04-09 10:00:31 UTC (rev 4804)
@@ -29,9 +29,6 @@
<form name="RunMrp" type="single"
target="runMrpGo" title=""
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="facilityId" title="${uiLabelMap.ProductFacility}">
<drop-down allow-empty="false">
<entity-options entity-name="Facility" description="${facilityName} [${facilityId}]"/>
Modified: trunk/applications/manufacturing/webapp/manufacturing/requirement/RequirementForms.xml
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/requirement/RequirementForms.xml 2005-04-09 09:47:41 UTC (rev 4803)
+++ trunk/applications/manufacturing/webapp/manufacturing/requirement/RequirementForms.xml 2005-04-09 10:00:31 UTC (rev 4804)
@@ -30,9 +30,6 @@
<form name="FindRequirements" type="single"
target="FindRequirements" title=""
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="hideSearch"><hidden value="Y"/></field>
<field name="requirementId" title="${uiLabelMap.ManufacturingRequirementId}"><text-find default-value="equals"/></field>
<field name="requirementTypeId" title="${uiLabelMap.ManufacturingRequirementTypeId}">
@@ -61,7 +58,6 @@
target="approveRequirements" title="" list-iterator-name="listIt" paginate-target="FindRequirements"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
<set field="entityName" value="Requirement"/>
<service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
<field-map field-name="inputFields" env-name="requestParameters"/>
Modified: trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml 2005-04-09 09:47:41 UTC (rev 4803)
+++ trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml 2005-04-09 10:00:31 UTC (rev 4804)
@@ -30,9 +30,6 @@
<form name="ListCalendarWeek" type="list"
target="UpdateCalendarWeek" title="" list-name="calendarWeeks"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" >
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="updateLink" title="&nbsp;" widget-style="buttontext">
@@ -49,9 +46,6 @@
<form name="ListCalendarExceptionDay" type="list"
target="UpdateCalendarExceptionDay" title="" list-name="calendarExceptionDays"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" >
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<auto-fields-service service-name="updateCalendarExceptionDay" map-name="calendarExceptionDay"/>
<field name="calendarId"><hidden/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
@@ -70,9 +64,6 @@
<form name="UpdateCalendarExceptionDay" type="single"
target="UpdateCalendarExceptionDay" title=""
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<auto-fields-service service-name="updateCalendarExceptionDay" map-name="calendarExceptionDay"/>
<field name="calendarId" ><hidden/></field>
<field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}" ><display/></field>
@@ -90,9 +81,6 @@
<form name="AddCalendarExceptionDay" type="single"
target="CreateCalendarExceptionDay" title=""
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<auto-fields-service service-name="createCalendarExceptionDay" map-name="calendarExceptionDay"/>
<field name="calendarId" map-name="techDataCalendar"><hidden/></field>
<field name="description" title="${uiLabelMap.CommonDescription}" ></field>
@@ -106,9 +94,6 @@
target="UpdateCalendarExceptionWeek" title="" list-name="calendarExceptionWeeksDatas"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
>
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<auto-fields-service service-name="updateCalendarExceptionWeek" map-name="calendarExceptionWeek"/>
<field name="calendarId"><hidden/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display /></field>
@@ -127,9 +112,6 @@
<form name="UpdateCalendarExceptionWeek" type="single"
target="UpdateCalendarExceptionWeek" title=""
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<auto-fields-service service-name="updateCalendarExceptionWeek" map-name="calendarExceptionWeek"/>
<field name="calendarId" ><hidden/></field>
<field name="exceptionDateStart" title="${uiLabelMap.ManufacturingExceptionDateStart}" ><display/></field>
@@ -151,9 +133,6 @@
<form name="AddCalendarExceptionWeek" type="single"
target="CreateCalendarExceptionWeek" title=""
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<auto-fields-service service-name="createCalendarExceptionWeek" map-name="calendarExceptionWeek"/>
<field name="calendarId" map-name="techDatacalendar"><hidden/></field>
<field name="description" title="${uiLabelMap.CommonDescription}" ></field>
Modified: trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml 2005-04-09 09:47:41 UTC (rev 4803)
+++ trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml 2005-04-09 10:00:31 UTC (rev 4804)
@@ -31,9 +31,6 @@
<form name="FindRoutings" type="single"
target="FindRouting" title=""
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="hideSearch"><hidden value="Y"/></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingId}">
<text-find default-value="equals"/>
@@ -49,7 +46,6 @@
title="" list-iterator-name="listIt" paginate-target="FindRouting"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
<set field="entityName" value="WorkEffort"/>
<service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
<field-map field-name="inputFields" env-name="requestParameters"/>
@@ -90,9 +86,6 @@
<form name="FindRoutingTasks" type="single"
target="FindRoutingTask" title=""
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="hideSearch"><hidden value="Y"/></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingTaskId}">
<text-find default-value="equals"/>
@@ -115,7 +108,6 @@
title="" list-iterator-name="listIt" paginate-target="FindRoutingTask"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
<set field="entityName" value="WorkEffort"/>
<service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
<field-map field-name="inputFields" env-name="requestParameters"/>
@@ -174,9 +166,6 @@
<form name="ListRoutingTaskRoutings" type="list"
title="" list-name="allRoutings"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="workEffortIdFrom" title="${uiLabelMap.ManufacturingRouting}">
<display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="[${workEffortId}] ${workEffortName}"/>
</field>
@@ -192,9 +181,6 @@
<form name="ListRoutingTaskAssoc" type="list"
target="EditRoutingTaskAssoc" title="" list-name="allRoutingTasks"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<auto-fields-service service-name="updateWorkEffortAssoc" map-name="routingTaskAssoc"/>
<field name="workEffortIdFrom"><hidden/></field>
<field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
@@ -219,9 +205,6 @@
<form name="UpdateRoutingTaskAssoc" type="single"
target="UpdateRoutingTaskAssoc" title=""
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<auto-fields-service service-name="updateWorkEffortAssoc" map-name="routingTaskAssoc"/>
<field name="workEffortId"><hidden value="${workEffortIdFrom}"/></field>
<field name="workEffortIdFrom"><hidden/></field>
@@ -243,9 +226,6 @@
<form name="EditRoutingProductLink" type="single"
target="UpdateRoutingProductLink" title="" default-map-name="routingProductLink"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<alt-target use-when="routingProductLink==null" target="AddRoutingProductLink"/>
<auto-fields-entity entity-name="WorkEffortGoodStandard" default-field-type="edit"/>
<field name="workEffortId"><hidden/></field>
@@ -265,9 +245,6 @@
<form name="ListRoutingProductLink" type="list"
target="EditRoutingProductLink" title="" list-name="allRoutingProductLinks"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap"/>
- </actions>
<field name="productId" title="${uiLabelMap.ProductProductName}"><display/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
More information about the Svn
mailing list