You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2010/03/01 11:40:53 UTC
svn commit: r917457 - in /ofbiz/trunk/applications/manufacturing:
src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
widget/manufacturing/RoutingTaskForms.xml
Author: jacopoc
Date: Mon Mar 1 10:40:52 2010
New Revision: 917457
URL: http://svn.apache.org/viewvc?rev=917457&view=rev
Log:
The WorkEffort.reservPersons is now available also in production run tasks.
Modified:
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=917457&r1=917456&r2=917457&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original)
+++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Mon Mar 1 10:40:52 2010
@@ -330,6 +330,7 @@
serviceContext.put("currentStatusId","PRUN_CREATED");
serviceContext.put("workEffortParentId", productionRunId);
serviceContext.put("facilityId", facilityId);
+ serviceContext.put("reservPersons", routingTask.get("reservPersons"));
serviceContext.put("estimatedStartDate",startDate);
serviceContext.put("estimatedCompletionDate",endDate);
serviceContext.put("estimatedSetupMillis", routingTask.get("estimatedSetupMillis"));
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=917457&r1=917456&r2=917457&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Mon Mar 1 10:40:52 2010
@@ -152,6 +152,7 @@
<field name="priority" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}"><display description="${workEffortName} [${workEffortId}]"/></field>
<field name="fixedAssetId" title="${uiLabelMap.ManufacturingMachine}"><display/></field>
+ <field name="reservPersons"><display/></field>
<field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><display/></field>
<field name="estimatedCompletionDate" title="${uiLabelMap.ManufacturingEstimatedCompletionDate}"><display/></field>
<field name="estimatedSetupMillis" title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}" ><display/></field>
@@ -166,6 +167,7 @@
<field name="priority" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}"><display description="${workEffortName} [${workEffortId}]"/></field>
<field name="fixedAssetId" title="${uiLabelMap.ManufacturingMachine}"><display/></field>
+ <field name="reservPersons"><display/></field>
<field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><display/></field>
<field name="estimatedCompletionDate" title="${uiLabelMap.ManufacturingEstimatedCompletionDate}"><display/></field>
<field name="estimatedSetupMillis" title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}" ><display/></field>
@@ -223,6 +225,7 @@
<field name="description">
<text/>
</field>
+ <field name="reservPersons"><text/></field>
<field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}">
<date-time/>
</field>
@@ -337,6 +340,7 @@
<display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
</field>
<field name="fixedAssetId" title="${uiLabelMap.ManufacturingMachine}"><display/></field>
+ <field name="reservPersons"><display/></field>
<field name="estimatedCompletionDate" title="${uiLabelMap.ManufacturingEstimatedCompletionDate}"><display/></field>
<field name="actualSetupMillis" title="${uiLabelMap.ManufacturingTaskActualSetupMillis}" ><display/></field>
<field name="actualMilliSeconds" title="${uiLabelMap.ManufacturingTaskActualMilliSeconds}" ><display/></field>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml?rev=917457&r1=917456&r2=917457&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml Mon Mar 1 10:40:52 2010
@@ -147,6 +147,7 @@
</entity-options>
</drop-down>
</field>
+ <field name="reservPersons"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}">
<submit button-type="button"/>
</field>