svn commit: r1169633 - in /ofbiz/branches/release11.04: ./ applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1169633 - in /ofbiz/branches/release11.04: ./ applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl

jleroux@apache.org
Author: jleroux
Date: Mon Sep 12 07:32:49 2011
New Revision: 1169633

URL: http://svn.apache.org/viewvc?rev=1169633&view=rev
Log:
Removes ?if_exists and ! from Scott's remark on r1167501


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 07:32:49 2011
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4:951708-952957
 /ofbiz/branches/jquery:952958-1044489
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517
+/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606

Modified: ofbiz/branches/release11.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl?rev=1169633&r1=1169632&r2=1169633&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl (original)
+++ ofbiz/branches/release11.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl Mon Sep 12 07:32:49 2011
@@ -20,8 +20,8 @@ under the License.
 <#list taskCosts as taskCost>
   <div class="screenlet">
     <div class="screenlet-title-bar">
-      <#assign task = taskCost.task!>
-      <h3>${uiLabelMap.ManufacturingActualCosts} ${task.workEffortName?if_exists} [${task.workEffortId?if_exists}]</h3>
+      <#assign task = taskCost.task>
+      <h3>${uiLabelMap.ManufacturingActualCosts} ${task.workEffortName?if_exists} [${task.workEffortId}]</h3>
     </div>
     <div class="screenlet-body">
       <#assign costsForm = taskCost.costsForm>