svn commit: r523256 - in /ofbiz/trunk/applications/manufacturing: config/ webapp/manufacturing/WEB-INF/actions/jobshopmgt/

[jacopoc]

Author: jacopoc
Date: Wed Mar 28 03:00:28 2007
New Revision: 523256

URL: http://svn.apache.org/viewvc?view=rev&rev=523256
Log:
Misc improvements to the filters for production run tasks.

Modified:
    
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.bsh
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.bsh
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.bsh

Modified: 
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties?view=diff&rev=523256&r1=523255&r2=523256
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties 
(original)
+++ 
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties 
Wed Mar 28 03:00:28 2007
@@ -192,6 +192,7 @@
 ManufacturingRoutingTaskId=Routing Task Id
 ManufacturingRoutingTaskToMissing=Routing Task To is Missing
 ManufacturingRunMrp=Run MRP
+ManufacturingSchedule=Schedule
 ManufacturingScrapFactor=Scrap Factor %
 ManufacturingShipmentPlans=Shipment Plans
 ManufacturingShipmentPlanStockReport=Shipment Plan Stock Report 

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.bsh
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.bsh?view=diff&rev=523256&r1=523255&r2=523256
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.bsh
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.bsh
 Wed Mar 28 03:00:28 2007
@@ -34,7 +34,7 @@
 }
 
 List taskInfos = new ArrayList();
-List tasks = delegator.findByAnd("WorkEffort", 
UtilMisc.toMap("workEffortParentId", productionRunId), 
UtilMisc.toList("workEffortId"));
+List tasks = delegator.findByAnd("WorkEffort", 
UtilMisc.toMap("workEffortParentId", productionRunId, "workEffortTypeId", 
"PROD_ORDER_TASK"), UtilMisc.toList("workEffortId"));
 Iterator tasksIt = tasks.iterator();
 while (tasksIt.hasNext()) {
     GenericValue task = (GenericValue)tasksIt.next();

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.bsh
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.bsh?view=diff&rev=523256&r1=523255&r2=523256
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.bsh
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.bsh
 Wed Mar 28 03:00:28 2007
@@ -35,7 +35,7 @@
 }
 
 List taskCosts = new ArrayList();
-List tasks = delegator.findByAnd("WorkEffort", 
UtilMisc.toMap("workEffortParentId", productionRunId), 
UtilMisc.toList("workEffortId"));
+List tasks = delegator.findByAnd("WorkEffort", 
UtilMisc.toMap("workEffortParentId", productionRunId, "workEffortTypeId", 
"PROD_ORDER_TASK"), UtilMisc.toList("workEffortId"));
 Iterator tasksIt = tasks.iterator();
 while (tasksIt.hasNext()) {
     GenericValue task = (GenericValue)tasksIt.next();

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.bsh
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.bsh?view=diff&rev=523256&r1=523255&r2=523256
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.bsh
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.bsh
 Wed Mar 28 03:00:28 2007
@@ -34,7 +34,7 @@
 }
 
 List taskInfos = new ArrayList();
-List tasks = delegator.findByAnd("WorkEffort", 
UtilMisc.toMap("workEffortParentId", productionRunId), 
UtilMisc.toList("workEffortId"));
+List tasks = delegator.findByAnd("WorkEffort", 
UtilMisc.toMap("workEffortParentId", productionRunId, "workEffortTypeId", 
"PROD_ORDER_TASK"), UtilMisc.toList("workEffortId"));
 Iterator tasksIt = tasks.iterator();
 while (tasksIt.hasNext()) {
     GenericValue task = (GenericValue)tasksIt.next();