svn commit: r988927 - in /ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing: WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy jobshopmgt/ProductionRun.fo.ftl

[jacopoc]

Author: jacopoc
Date: Wed Aug 25 09:28:52 2010
New Revision: 988927

URL: http://svn.apache.org/viewvc?rev=988927&view=rev
Log:
Backported rev. 988923: Fixed bug that was preventing the product name from appearing in the production run pdf; also added the production run name, when available; slightly improved the pdf layout for these two fields.

Modified:
    ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
    ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl

Modified: ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=988927&r1=988926&r2=988927&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original)
+++ ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Wed Aug 25 09:28:52 2010
@@ -78,6 +78,7 @@ if (productionRunId) {
         productionRunData = [:];
         productionRunData.workEffortId = productionRunId;
         productionRunData.productId = productionRun.getProductProduced().productId;
+        productionRunData.product = productionRun.getProductProduced();
         if (maxQuantity > 0 && !"WIP".equals(productionRun.getProductProduced().productTypeId)) {
             productionRunData.quantity = maxQuantity;
             context.canProduce = "Y";

Modified: ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl?rev=988927&r1=988926&r2=988927&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl (original)
+++ ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl Wed Aug 25 09:28:52 2010
@@ -18,8 +18,8 @@ under the License.
 -->
 <#escape x as x?xml>
 <#if productionRunId?has_content>
-            <fo:block space-after.optimum="0.3cm">${uiLabelMap.ManufacturingProductionRunId}: ${productionRunData.workEffortId?if_exists}</fo:block>
-            <fo:block space-after.optimum="1.0cm">${uiLabelMap.ProductProductId}: ${productionRunData.productId?if_exists}/${productionRunData.productName?if_exists}</fo:block>
+            <fo:block>${uiLabelMap.ManufacturingProductionRunId}: ${productionRunData.workEffortId?if_exists}<#if productionRunData.productionRunName?exists> / ${productionRunData.productionRunName}</#if></fo:block>
+            <fo:block space-after.optimum="0.2cm">${uiLabelMap.ProductProductId}: ${productionRunData.productId?if_exists}<#if productionRunData.product.productName?exists> / ${productionRunData.product.productName}</#if></fo:block>
             <#assign dimColor = "#D4D0C8">
             <fo:table>
                 <fo:table-column column-width="4.0cm"/>