svn commit: r592679 - in /ofbiz/trunk/applications/manufacturing: config/ManufacturingUiLabels.properties webapp/manufacturing/jobshopmgt/ProductionRunForms.xml

[lektran]

Author: lektran
Date: Wed Nov  7 02:00:24 2007
New Revision: 592679

URL: http://svn.apache.org/viewvc?rev=592679&view=rev
Log:
A few more uiLabel tidy ups

Modified:
    ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties?rev=592679&r1=592678&r2=592679&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties Wed Nov  7 02:00:24 2007
@@ -75,10 +75,10 @@
 ManufacturingEditProductionRun=Edit Production Run
 ManufacturingEditRouting=Edit Routing
 ManufacturingEditRoutingProductLink=Edit Routing Product Link
-ManufacturingEditRoutingTask=Edit RoutingTask
-ManufacturingEditRoutingTaskId=Edit RoutingTask - ID
-ManufacturingEditRoutingTaskAssoc=Edit RoutingTask Assoc
-ManufacturingEditRoutingTaskAssocDateValidity=Edit RoutingTask Association Date validity
+ManufacturingEditRoutingTask=Edit Routing Task
+ManufacturingEditRoutingTaskId=Edit Routing Task - ID
+ManufacturingEditRoutingTaskAssoc=Edit Routing Task Assoc
+ManufacturingEditRoutingTaskAssocDateValidity=Edit Routing Task Association Date validity
 ManufacturingRoutingTaskCosts=Routing Task Costs
 ManufacturingErrorBomNotExist=Error, Bom does not exist
 ManufacturingEstimatedCompletionDate=Calculated Completion Date
@@ -109,16 +109,16 @@
 ManufacturingJobShop=JobShop
 ManufacturingListCalendarWeek=List of weeks
 ManufacturingListingBomError=Error while listing the Bill of Material
-ManufacturingListOfProductionRunComponents=List Of ProductionRun Components
-ManufacturingListOfProductionRunFixedAssets=List Of ProductionRun FixedAssets
+ManufacturingListOfProductionRunComponents=List Of Production Run Components
+ManufacturingListOfProductionRunFixedAssets=List Of Production Run Fixed Assets
 ManufacturingListOfProductionRunRoutingTasks=Tasks
 ManufacturingListProducts=Deliverable Products
 ManufacturingListRoutings=List Routings
-ManufacturingMachineGroupIdAlreadyExist=Fixed Asset Group ID does'nt exist
+ManufacturingMachineGroupIdAlreadyExist=Fixed Asset Group ID doesn't exist
 ManufacturingMachineGroupId=Fixed Asset group ID
 ManufacturingMachineGroup=Fixed Asset group
-ManufacturingMachineGroupPermissionError=Security Error\: to work on Fixed Asset group you must have the MANUFACTURING_CREATE or MANUFACTURING_ADMIN permission <br>
-ManufacturingMachineIdAlreadyExist=Fixed AssetId already exist
+ManufacturingMachineGroupPermissionError=Security Error\: to work on a Fixed Asset Group you must have the MANUFACTURING_CREATE or MANUFACTURING_ADMIN permission <br>
+ManufacturingMachineIdAlreadyExist=Fixed Asset Id already exists
 ManufacturingMachineId=Fixed Asset ID
 ManufacturingMachine=Fixed Asset
 ManufacturingMachinePermissionError=Security Error\: to work on Fixed Asset you must have the MANUFACTURING_CREATE or MANUFACTURING_ADMIN permission <br>
@@ -162,14 +162,14 @@
 ManufacturingProductionRunFixedAssetAssign=Fixed Asset Assign
 ManufacturingProductionRunFixedAssetIdMissing=Fixed Asset Id is missing
 ManufacturingProductionRunId=Production Run ID
-ManufacturingProductionRunName=ProductionRun Name
-ManufacturingProductionRunNotUpdated=ProductionRun update failed see log for more information
-ManufacturingProductionRunProductComponent=ProductionRun Product Component
-ManufacturingProductionRunQuantityMissing=ProductionRun Quantity is Missing
-ManufacturingProductionRunQuantityNotCorrect=ProductionRun Quantity field is not formatted correctly
-ManufacturingProductionRunStartDateMissing=ProductionRun StartDate is Missing
+ManufacturingProductionRunName=Production Run Name
+ManufacturingProductionRunNotUpdated=Production Run update failed see log for more information
+ManufacturingProductionRunProductComponent=Production Run Product Component
+ManufacturingProductionRunQuantityMissing=Production Run Quantity is missing
+ManufacturingProductionRunQuantityNotCorrect=Production Run Quantity field is not formatted correctly
+ManufacturingProductionRunStartDateMissing=Production Run Start Date is missing
 ManufacturingProductionRunStartDateNotCorrect=the Start Date field is incorrect, format must be AAAA-mm-jj HH:mm:ss
-ManufacturingProductionRunStatusChanged=ProductionRun status changed successfully.
+ManufacturingProductionRunStatusChanged=Production Run status changed successfully.
 ManufacturingProductId=Product ID
 ManufacturingProductIdTo=Product ID To
 ManufacturingProductNotExist=Product does not exist
@@ -211,6 +211,7 @@
 ManufacturingTaskEstimatedMilliSeconds=Estimated Unit Run Time
 ManufacturingTaskEstimatedTotalMilliSeconds=Estimated Total Run Time
 ManufacturingTaskEstimatedSetupMillis=Estimated Setup Time
+ManufacturingTaskFixedAssets=Routing Task Fixed Assets
 ManufacturingTaskId=Task ID
 ManufacturingTaskName=Routing Task Name
 ManufacturingTaskPurpose=Task Type

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=592679&r1=592678&r2=592679&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Wed Nov  7 02:00:24 2007
@@ -31,7 +31,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="routingId"><lookup target-form-name="LookupRouting" size="16"/></field>
+        <field name="routingId" title="${uiLabelMap.ManufacturingRoutingId}"><lookup target-form-name="LookupRouting" size="16"/></field>
         <field name="workEffortName" title="${uiLabelMap.ManufacturingProductionRunName}"><text size="30"/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text size="50"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}">
@@ -483,14 +483,14 @@
     <form name="AddProductionRunTaskFixedAsset" type="single" target="createWorkEffortFixedAssetAssign" title="">
         <auto-fields-service service-name="createWorkEffortFixedAssetAssign" />
         <field name="productionRunId"><hidden /></field>
-        <field name="workEffortId">
+        <field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingTask}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="WorkEffort" description="[${workEffortId}] ${workEffortName}">
+                <entity-options entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]">
                     <entity-constraint name="workEffortParentId" value="${productionRunId}" />
                 </entity-options>
             </drop-down>
         </field>
-        <field name="fixedAssetId">
+        <field name="fixedAssetId" title="${uiLabelMap.ManufacturingMachine}">
             <drop-down allow-empty="false">
                 <entity-options entity-name="FixedAsset" description="${fixedAssetName} [${fixedAssetId}]" />
             </drop-down>
@@ -633,7 +633,7 @@
     </form>
     <form name="ProductionRunTaskComponents" type="list" target="updateProductionRunComponent" paginate-target="ProductionRunComponents" title="" list-name="records">
         <field name="productId"><display/></field>
-        <field name="internalName" entry-name="productId">
+        <field name="internalName" entry-name="productId" title="${uiLabelMap.ProductProductInternalName}">
             <display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/>
         </field>
         <field name="workEffortId"><hidden/></field>