svn commit: r523718 - /ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl

[jacopoc]

Author: jacopoc
Date: Thu Mar 29 07:08:23 2007
New Revision: 523718

URL: http://svn.apache.org/viewvc?view=rev&rev=523718
Log:
Misc improvements for the production runs in the scheduled status.

Modified:
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl?view=diff&rev=523718&r1=523717&r2=523718
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl
 Thu Mar 29 07:08:23 2007
@@ -26,7 +26,7 @@
         <#if "PRUN_COMPLETED" == 
mandatoryWorkEffort.getString("currentStatusId") || "PRUN_CLOSED" == 
mandatoryWorkEffort.getString("currentStatusId")>
             <a 
href="<@ofbizUrl>ProductionRunDeclaration?productionRunId=${mandatoryWorkEffort.workEffortId}</@ofbizUrl>"
 class="buttontext">${mandatoryWorkEffort.workEffortName}</a>&nbsp;
         <#else>
-            <#if "PRUN_CREATED" == 
mandatoryWorkEffort.getString("currentStatusId")>
+            <#if "PRUN_CREATED" == 
mandatoryWorkEffort.getString("currentStatusId") || "PRUN_SCHEDULED" == 
mandatoryWorkEffort.getString("currentStatusId")>
                 <a 
href="<@ofbizUrl>EditProductionRun?productionRunId=${mandatoryWorkEffort.workEffortId}</@ofbizUrl>"
 class="buttontext">${mandatoryWorkEffort.workEffortName}</a>[*]&nbsp;
             <#else>
                 <a 
href="<@ofbizUrl>ProductionRunDeclaration?productionRunId=${mandatoryWorkEffort.workEffortId}</@ofbizUrl>"
 class="buttontext">${mandatoryWorkEffort.workEffortName}</a>[*]&nbsp;
@@ -44,7 +44,7 @@
         <#if "PRUN_COMPLETED" == dependentWorkEffort.currentStatusId || 
"PRUN_CLOSED" == dependentWorkEffort.currentStatusId>
             <a 
href="<@ofbizUrl>ProductionRunDeclaration?productionRunId=${dependentWorkEffort.workEffortId}</@ofbizUrl>"
 class="buttontext">${dependentWorkEffort.workEffortName}</a>&nbsp;
         <#else>
-            <#if "PRUN_CREATED" == 
dependentWorkEffort.getString("currentStatusId")>
+            <#if "PRUN_CREATED" == 
dependentWorkEffort.getString("currentStatusId") || "PRUN_SCHEDULED" == 
dependentWorkEffort.getString("currentStatusId")>
                 <a 
href="<@ofbizUrl>EditProductionRun?productionRunId=${dependentWorkEffort.workEffortId}</@ofbizUrl>"
 class="buttontext">${dependentWorkEffort.workEffortName}</a>[*]&nbsp;
             <#else>
                 <a 
href="<@ofbizUrl>ProductionRunDeclaration?productionRunId=${dependentWorkEffort.workEffortId}</@ofbizUrl>"
 class="buttontext">${dependentWorkEffort.workEffortName}</a>[*]&nbsp;