Author: hansbak
Date: Mon Jul 13 07:42:39 2009
New Revision: 793479
URL:
http://svn.apache.org/viewvc?rev=793479&view=revLog:
commented out code which contains an error because it can prevent running a production run. included a suggestion how to fix it, but i am unable to test it. Jacopo, can you?
Modified:
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
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=793479&r1=793478&r2=793479&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 Jul 13 07:42:39 2009
@@ -1014,9 +1014,11 @@
}
// Now get the cost information associated to the fixed asset and compute the costs
GenericValue fixedAsset = workEffort.getRelatedOne("FixedAsset");
- if (UtilValidate.isEmpty(fixedAsset) && UtilValidate.isNotEmpty(routingTask)) {
- fixedAsset = routingTask.getRelatedOne("FixedAsset");
+/* TODO if (UtilValidate.isEmpty(fixedAsset) && UtilValidate.isNotEmpty(routingTask)) {
+ field does not exist, workEffortAssoc does not have a fixedAssetId: fixedAsset = routingTask.getRelatedOne("FixedAsset");
+ better?: fixedAsset = routingTask.getRelatedOne("workEffortIdTo").getRelatedOne("FixedAsset");
}
+*/
if (UtilValidate.isNotEmpty(fixedAsset)) {
List setupCosts = fixedAsset.getRelatedByAnd("FixedAssetStdCost", UtilMisc.toMap("fixedAssetStdCostTypeId", "SETUP_COST"));
GenericValue setupCost = EntityUtil.getFirst(EntityUtil.filterByDate(setupCosts));