You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/03/28 13:10:43 UTC

svn commit: r1736867 [2/3] - in /ofbiz/trunk/applications/manufacturing: template/ template/bom/ template/jobshopmgt/ template/mrp/ template/reports/ template/routing/ webapp/manufacturing/bom/ webapp/manufacturing/jobshopmgt/ webapp/manufacturing/mrp/...

Added: ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,227 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:fox="http://xml.apache.org/fop/extensions">
+    <fo:layout-master-set>
+        <fo:simple-page-master margin-right="2.0cm" margin-left="2.0cm" margin-bottom="1.0cm" margin-top="1.0cm" page-width="21cm" page-height="29.7cm" master-name="first">
+            <fo:region-before extent="1.5cm"/>
+            <fo:region-body margin-bottom="1.5cm" margin-top="1.5cm"/>
+            <fo:region-after extent="1.0cm"/>
+        </fo:simple-page-master>
+    </fo:layout-master-set>
+
+<#if productionRuns??>
+
+<#list productionRuns as productionRun>
+    <#assign componentList = productionRun.componentList>
+    <fo:page-sequence master-reference="first" language="en" hyphenate="true">
+        <fo:static-content flow-name="xsl-region-before">
+            <fo:block line-height="10pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+
+                      Doc.G
+
+            </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.CommonPage} <fo:page-number/>
+            </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+            <fo:block line-height="20pt" font-weight="bold" font-size="18pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="center">
+                ${uiLabelMap.ManufacturingHardware}
+            </fo:block>
+
+            <fo:block line-height="10pt" font-weight="bold" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="center">
+                ${productionRun.product.internalName}
+            </fo:block>
+
+            <fo:table text-align="left" table-layout="fixed">
+                <fo:table-column column-width="10.15cm"/>
+                <fo:table-column column-width="6.15cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${uiLabelMap.OrderOrderId}:</fo:inline>
+                                <fo:inline font-weight="bold" font-size="10pt">${productionRun.productionRunOrder.orderId}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${uiLabelMap.ManufacturingEstimatedCompletionDate}:</fo:inline>
+                                <fo:inline font-weight="bold" font-size="10pt">${Static["org.ofbiz.base.util.UtilDateTime"].nowDateString("dd/MM/yyyy")}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+            <fo:table text-align="left" table-layout="fixed">
+                <fo:table-column column-width="10.15cm"/>
+                <fo:table-column column-width="6.15cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${uiLabelMap.PartyParty}:</fo:inline>
+                                <fo:inline font-weight="bold" font-size="10pt">${productionRun.customer.partyId} - ${productionRun.customer.firstName} - ${productionRun.address.city}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${uiLabelMap.FormFieldTitle_effectiveDate}:</fo:inline>
+                                <fo:inline font-size="10pt">___________________</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+            <fo:table text-align="left" table-layout="fixed">
+                <fo:table-column column-width="10.15cm"/>
+                <fo:table-column column-width="6.15cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${uiLabelMap.ManufacturingRequester} :</fo:inline>
+                                <fo:inline font-size="10pt">__________________</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${uiLabelMap.CommonApproved} :</fo:inline>
+                                <fo:inline font-size="10pt">__________________</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+            <fo:inline white-space-collapse="false">
+            </fo:inline>
+
+<fo:table text-align="left" table-layout="fixed">
+<fo:table-column column-width="0.80cm"/>
+<fo:table-column column-width="2.50cm"/>
+<fo:table-column column-width="4.50cm"/>
+<fo:table-column column-width="1.50cm"/>
+<fo:table-column column-width="1.50cm"/>
+<fo:table-column column-width="6.00cm"/>
+<!--
+<fo:table-column column-width="4.00cm"/>
+-->
+<fo:table-body>
+    <fo:table-row>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.CommonLine}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.ProductProductId}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.CommonDescription}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="center">
+                    ${uiLabelMap.CommonUom}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="center">
+                    ${uiLabelMap.CommonQuantity}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="center">
+                    ${uiLabelMap.ManufacturingReleased}
+            </fo:block>
+        </fo:table-cell>
+<!--
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="center">
+                    ${uiLabelMap.ManufacturingReleasedNote}
+            </fo:block>
+        </fo:table-cell>
+-->
+    </fo:table-row>
+
+    <#assign row = 0>
+        <#list componentList as product>
+        <#assign row = row + 1>
+    <fo:table-row>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                ${row}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${product.componentProduct.productId}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${product.componentProduct.internalName!}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                ${product.componentProduct.quantityUomId!}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                ${product.component.estimatedQuantity}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+
+            </fo:block>
+        </fo:table-cell>
+<!--
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                {Rel}
+            </fo:block>
+        </fo:table-cell>
+-->
+    </fo:table-row>
+    </#list>
+</fo:table-body>
+</fo:table>
+</fo:block>
+
+</fo:flow>
+</fo:page-sequence>
+</#list>
+</#if>
+</fo:root>
+</#escape>
+

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsAndOrder.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsAndOrder.fo.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsAndOrder.fo.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsAndOrder.fo.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,345 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:fox="http://xml.apache.org/fop/extensions">
+    <fo:layout-master-set>
+        <fo:simple-page-master margin-right="2.0cm" margin-left="2.0cm" margin-bottom="1.0cm" margin-top="1.0cm" page-width="21cm" page-height="29.7cm" master-name="first">
+            <fo:region-before extent="1.5cm"/>
+            <fo:region-body margin-bottom="1.5cm" margin-top="1.5cm"/>
+            <fo:region-after extent="1.0cm"/>
+        </fo:simple-page-master>
+    </fo:layout-master-set>
+
+<#list productionRuns as productionRun>
+
+
+
+    <fo:page-sequence master-reference="first" language="en" hyphenate="true">
+
+<!--  nota: codice documento    -->
+
+        <fo:static-content flow-name="xsl-region-before">
+            <fo:block line-height="8pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+
+Doc.D
+
+            </fo:block>
+        </fo:static-content>
+
+        <fo:flow flow-name="xsl-region-body">
+
+<!-- inizio riquadro -->
+<fo:table table-layout="fixed">
+             <fo:table-column column-width="18.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+<!--  nota: righe o celle dell'etichetta - 1� riga   -->
+
+            <fo:table text-align="center" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${uiLabelMap.ManufacturingProductionRun}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="10pt">${productionRun.productionRun.workEffortId}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+<!--  nota: righe o celle dell'etichetta - 2� riga   -->
+            <fo:table text-align="start" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${uiLabelMap.OrderOrderId}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="10pt">${productionRun.productionRunOrder.orderId}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+<!--  nota: righe o celle dell'etichetta - 3� riga  -->
+
+            <fo:table text-align="start" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="6.00cm"/>
+              <fo:table-column column-width="1.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${uiLabelMap.ManufacturingDestination}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${productionRun.address.address1} - ${productionRun.address.city}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                       </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+<!--  nota: righe o celle dell'etichetta - 4� riga  -->
+            <fo:table text-align="start" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="5.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline  font-size="8pt">${uiLabelMap.PartyParty}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="10pt">${productionRun.customer.firstName}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+<!--  nota: righe o celle dell'etichetta - 5� riga  -->
+
+            <fo:table text-align="start" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${uiLabelMap.ManufacturingReference} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${uiLabelMap.ManufacturingReference} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+<!--  nota: righe o celle dell'etichetta - 6� riga -->
+
+            <fo:table text-align="start" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.80cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.50cm"/>
+              <fo:table-column column-width="2.50cm"/>
+              <fo:table-column column-width="2.50cm"/>
+              <fo:table-column column-width="2.50cm"/>
+               <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${uiLabelMap.ProductShipmentPlan}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                               <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${productionRun.plan}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                                <fo:inline font-size="8pt">${uiLabelMap.ManufacturingModel} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="8pt">${productionRun.product.brandName!}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+<!--  nota: righe o celle dell'etichetta - 7� riga -->
+
+            <fo:table text-align="left" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="5.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="9pt">${productionRun.product.productId}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="9pt">${productionRun.product.internalName!}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                     </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+<!--  nota: righe o celle dell'etichetta - 8� riga  -->
+
+            <fo:table text-align="center" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="5.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+                 <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${productionRun.product.productHeight?default("---")} x ${productionRun.product.productWidth?default("---")} </fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+<!--  nota: righe o celle dell'etichetta - 9� riga -->
+            <fo:table text-align="left" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="5.00cm"/>
+              <fo:table-column column-width="5.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="12pt">${productionRun.location!}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="9pt">${uiLabelMap.ManufacturingPrintoutDate} : ${Static["org.ofbiz.base.util.UtilDateTime"].nowDateString("dd/MM/yyyy")}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="9pt">${uiLabelMap.ManufacturingCompletionDate} : ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRun.productionRun.estimatedCompletionDate, "dd/MM/yyyy")}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+<!-- fine riquadro -->
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+</fo:flow>
+</fo:page-sequence>
+</#list>
+
+</fo:root>
+</#escape>
+

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsAndOrder.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsAndOrder.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsAndOrder.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,242 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:fox="http://xml.apache.org/fop/extensions">
+    <fo:layout-master-set>
+        <fo:simple-page-master margin-right="2.0cm" margin-left="2.0cm" margin-bottom="1.0cm" margin-top="1.0cm" page-width="21cm" page-height="29.7cm" master-name="first">
+            <fo:region-before extent="1.5cm"/>
+            <fo:region-body margin-bottom="1.5cm" margin-top="1.5cm"/>
+            <fo:region-after extent="1.0cm"/>
+        </fo:simple-page-master>
+    </fo:layout-master-set>
+
+<#list features as feature>
+    <#assign productionRuns = feature.productionRuns>
+    <fo:page-sequence master-reference="first" language="en" hyphenate="true">
+        <fo:static-content flow-name="xsl-region-before">
+            <fo:block line-height="10pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+
+                <#if shipment??>
+                    Doc.E1
+                <#else>
+                    Doc.E0
+                </#if>
+
+            </fo:block>
+        </fo:static-content>
+
+        <fo:static-content flow-name="xsl-region-after">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.CommonPage} <fo:page-number/>
+            </fo:block>
+        </fo:static-content>
+
+        <fo:flow flow-name="xsl-region-body">
+            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+
+            <fo:block line-height="20pt" font-weight="bold" font-size="18pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="center">
+                ${uiLabelMap.ManufacturingProductionRun}
+            </fo:block>
+
+            <fo:table text-align="left" table-layout="fixed">
+                <fo:table-column column-width="10.15cm"/>
+                <fo:table-column column-width="6.15cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <#if shipment??>
+                                <fo:inline font-size="10pt">${uiLabelMap.ProductShipmentPlan}:</fo:inline>
+                                <fo:inline font-weight="bold" font-size="10pt">${shipment.shipmentId}</fo:inline>
+                                <#else>
+                                <fo:inline font-size="10pt">${uiLabelMap.ManufacturingPlan}:</fo:inline>
+                                <fo:inline font-weight="bold" font-size="10pt">${planName}</fo:inline>
+                                </#if>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                                <fo:inline font-size="10pt">${uiLabelMap.ProductProductCategory}:</fo:inline>
+                                <fo:inline font-weight="bold" font-size="10pt"><#if category??>${category.description!}</#if></fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+            <fo:table text-align="left" table-layout="fixed">
+                <fo:table-column column-width="10.15cm"/>
+                <fo:table-column column-width="6.15cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${uiLabelMap.ManufacturingPrintoutDate}:</fo:inline>
+                                <fo:inline font-weight="bold" font-size="10pt">${nowTimestamp}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                                <fo:inline font-size="10pt"><#if featureType??>${featureType.get("description",locale)!}: </#if></fo:inline>
+                                <fo:inline font-weight="bold" font-size="10pt"><#if feature.productFeature??>${feature.productFeature.description!}</#if></fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+            <fo:table text-align="left" table-layout="fixed">
+                <fo:table-column column-width="10.15cm"/>
+                <fo:table-column column-width="6.15cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <#if shipment??>
+                                <fo:inline font-size="10pt">${uiLabelMap.ManufacturingEstimatedShipDate} :</fo:inline>
+                                <fo:inline font-weight="bold" font-size="10pt">${shipment.estimatedShipDate!}</fo:inline>
+                                <#else>
+                                <fo:inline font-size="10pt">${uiLabelMap.ManufacturingPickingPeriod} :</fo:inline>
+                                <fo:inline font-weight="bold" font-size="10pt">${mrpName}</fo:inline>
+                                </#if>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+            <fo:inline white-space-collapse="false">
+            </fo:inline>
+
+<fo:table text-align="left" table-layout="fixed">
+<fo:table-column column-width="0.90cm"/>
+<fo:table-column column-width="1.70cm"/>
+<fo:table-column column-width="3.20cm"/>
+<fo:table-column column-width="1.20cm"/>
+<fo:table-column column-width="1.20cm"/>
+<fo:table-column column-width="4.50cm"/>
+<fo:table-column column-width="1.40cm"/>
+<fo:table-column column-width="2.10cm"/>
+<fo:table-body>
+    <fo:table-row>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.CommonLine}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.ManufacturingProductionRunId}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.ProductProductId}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.ProductProductHeight}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.ProductProductWidth}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.CommonDescription}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.CommonQuantity}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${uiLabelMap.ManufacturingProductBrandName}
+            </fo:block>
+        </fo:table-cell>
+    </fo:table-row>
+
+    <#assign row = 0>
+    <#list productionRuns as productionRun>
+        <#assign row = row + 1>
+    <fo:table-row>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                ${row}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${productionRun.productionRun.workEffortId}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${productionRun.product.productId}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                ${productionRun.product.productHeight!}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                ${productionRun.product.productWidth!}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${productionRun.product.internalName!}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                ${productionRun.productionRun.quantityToProduce!}
+            </fo:block>
+        </fo:table-cell>
+        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+            <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                ${productionRun.product.brandName!}
+            </fo:block>
+        </fo:table-cell>
+    </fo:table-row>
+    </#list>
+</fo:table-body>
+</fo:table>
+<!--
+<fo:block space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" id="LastPage" line-height="1pt" font-size="1pt">
+</fo:block>
+-->
+</fo:block>
+
+</fo:flow>
+</fo:page-sequence>
+</#list>
+</fo:root>
+</#escape>
+

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsStacks.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsStacks.fo.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsStacks.fo.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsStacks.fo.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,371 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:fox="http://xml.apache.org/fop/extensions">
+    <fo:layout-master-set>
+        <fo:simple-page-master margin-right="2.0cm" margin-left="2.0cm" margin-bottom="1.0cm" margin-top="1.0cm" page-width="21cm" page-height="29.7cm" master-name="first">
+            <fo:region-before extent="1.5cm"/>
+            <fo:region-body margin-bottom="1.5cm" margin-top="1.5cm"/>
+            <fo:region-after extent="1.0cm"/>
+        </fo:simple-page-master>
+    </fo:layout-master-set>
+
+<#list productionRuns as productionRun>
+  <#assign stackInfos = productionRun.stackInfos>
+  <#list stackInfos as stackInfo>
+    <fo:page-sequence master-reference="first" language="en" hyphenate="true">
+
+
+        <fo:static-content flow-name="xsl-region-before">
+            <fo:block line-height="10pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+
+
+            </fo:block>
+        </fo:static-content>
+
+        <fo:flow flow-name="xsl-region-body">
+
+<fo:table table-layout="fixed">
+             <fo:table-column column-width="18.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+
+            <fo:table text-align="center" table-layout="fixed">
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="1.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="6pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="6pt">${uiLabelMap.ManufacturingEstimatedCompletionDate}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="6pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="6pt">${uiLabelMap.ManufacturingPlan}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="6pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="6pt">${uiLabelMap.ManufacturingEstimatedCompletionDate}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+            <fo:table text-align="center" table-layout="fixed">
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="1.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="12pt">${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRun.productionRun.estimatedCompletionDate, "dd/MM/yyyy")}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="12pt">${productionRun.productionRun.workEffortName}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="12pt">${productionRun.productionRun.estimatedCompletionDate}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+
+            <fo:table text-align="center" table-layout="fixed">
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="1.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="6pt">${uiLabelMap.ManufacturingPrintoutDate}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="6pt">${uiLabelMap.ManufacturingProductionRunId}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="6pt">${uiLabelMap.ManufacturingPrintoutDate}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+            <fo:table text-align="center" table-layout="fixed">
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="1.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-weight="bold" font-size="12pt">${Static["org.ofbiz.base.util.UtilDateTime"].nowDateString("dd/MM/yyyy")}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:instream-foreign-object>
+                                  <barcode:barcode
+                                        xmlns:barcode="http://barcode4j.krysalis.org/ns"
+                                        message="${productionRun.productionRun.workEffortId}">
+                                    <barcode:code39>
+                                      <barcode:height>8mm</barcode:height>
+                                    </barcode:code39>
+                                  </barcode:barcode>
+                                </fo:instream-foreign-object>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-weight="bold" font-size="12pt">${nowTimestamp}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+
+            <fo:table text-align="center" table-layout="fixed">
+              <fo:table-column column-width="2.50cm"/>
+              <fo:table-column column-width="6.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="2.50cm"/>
+              <fo:table-column column-width="0.50cm"/>
+              <fo:table-column column-width="3.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="6pt">${uiLabelMap.CommonQuantity} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+
+
+
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="6pt">${uiLabelMap.ProductFacilityLocation} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="6pt">${uiLabelMap.CommonQuantity} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="6pt">${uiLabelMap.ProductFacilityLocation} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+
+            <fo:table text-align="center" table-layout="fixed">
+              <fo:table-column column-width="2.50cm"/>
+              <fo:table-column column-width="6.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="2.50cm"/>
+              <fo:table-column column-width="0.50cm"/>
+              <fo:table-column column-width="3.00cm"/>
+               <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="24pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-weight="bold" font-size="18pt">${stackInfo.qty}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="center">
+                              <fo:instream-foreign-object>
+                                <barcode:barcode
+                                      xmlns:barcode="http://barcode4j.krysalis.org/ns"
+                                      message="${stackInfo.qty}">
+                                  <barcode:code39>
+                                    <barcode:height>8mm</barcode:height>
+                                  </barcode:code39>
+                                </barcode:barcode>
+                              </fo:instream-foreign-object>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt"><#if productionRun.location??>${productionRun.location.locationSeqId!}</#if></fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="24pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-weight="bold" font-size="18pt">${stackInfo.qty}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt"><#if productionRun.location??>${productionRun.location.locationSeqId!}</#if></fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+
+            <fo:table text-align="left" table-layout="fixed">
+              <fo:table-column column-width="5.00cm"/>
+              <fo:table-column column-width="15.00cm"/>
+              <fo:table-column column-width="5.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="9pt">${uiLabelMap.ManufacturingLabelNumber} : ${stackInfo.stackNum} di ${stackInfo.numOfStacks}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+
+            <fo:table text-align="center" table-layout="fixed">
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="8.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="6.00cm"/>
+                 <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="6pt">${uiLabelMap.ProductProductId} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="6pt">${uiLabelMap.CommonDescription} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="6pt">${uiLabelMap.ProductProductId} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="6pt">${uiLabelMap.CommonDescription} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+            <fo:table text-align="left" table-layout="fixed">
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="8.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="6.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="12pt">${productionRun.product.productId}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="12pt">${productionRun.product.internalName}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="12pt">${productionRun.product.productId}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="9pt">${productionRun.product.internalName}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+</fo:flow>
+</fo:page-sequence>
+</#list>
+</#list>
+
+</fo:root>
+</#escape>
+

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsStacks.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsStacks.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsStacks.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,315 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:fox="http://xml.apache.org/fop/extensions">
+    <fo:layout-master-set>
+        <fo:simple-page-master margin-right="2.0cm" margin-left="2.0cm" margin-bottom="1.0cm" margin-top="1.0cm" page-width="21cm" page-height="29.7cm" master-name="first">
+            <fo:region-before extent="1.5cm"/>
+            <fo:region-body margin-bottom="1.5cm" margin-top="1.5cm"/>
+            <fo:region-after extent="1.0cm"/>
+        </fo:simple-page-master>
+    </fo:layout-master-set>
+
+<#list packages as package>
+    <#assign components = package.components>
+
+    <fo:page-sequence master-reference="first" language="en" hyphenate="true">
+
+<!--  nota: codice documento    -->
+
+        <fo:static-content flow-name="xsl-region-before">
+            <fo:block line-height="10pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+
+Doc.B
+
+            </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+
+<!--  nota: titolo    -->
+<!--        <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> -->
+
+<!--
+            <fo:block line-height="20pt" font-weight="bold" font-size="18pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="center">
+                ${uiLabelMap.ManufacturingProductionRun}
+            </fo:block>
+-->
+<!-- inizio riquadro -->
+          <fo:table table-layout="fixed">
+             <fo:table-column column-width="18.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
+
+
+<!--  nota: riga vuota   -->
+            <fo:table text-align="start" table-layout="fixed">
+              <fo:table-column column-width="12.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">  </fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+<!--  nota: righe o celle dell'etichetta - 1� riga   -->
+            <fo:table text-align="start" table-layout="fixed">
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="1.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${uiLabelMap.ProductShipmentPlan}: </fo:inline>
+                                <fo:inline font-size="11pt">${package.orderShipment.shipmentId}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${uiLabelMap.ManufacturingPackageNumber}: </fo:inline>
+                                <fo:inline font-size="11pt">${package.packageId}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${Static["org.ofbiz.base.util.UtilDateTime"].nowDateString("dd/MM/yyyy")}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+<!--  nota: righe o celle dell'etichetta - 2� riga   -->
+            <fo:table text-align="start" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="8.00cm"/>
+              <fo:table-column column-width="1.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${uiLabelMap.OrderOrderId} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="10pt">${package.orderShipment.orderId}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
+                                <fo:instream-foreign-object>
+                                  <barcode:barcode
+                                        xmlns:barcode="http://barcode4j.krysalis.org/ns"
+                                        message="${package.orderShipment.shipmentId}${package.packageId}">
+                                    <barcode:code39>
+                                      <barcode:height>8mm</barcode:height>
+                                    </barcode:code39>
+                                  </barcode:barcode>
+                                </fo:instream-foreign-object>
+                            </fo:block>
+
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+<!--  nota: righe o celle dell'etichetta - 3� riga  -->
+
+            <fo:table text-align="start" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="5.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${uiLabelMap.ManufacturingDestination}:</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="10pt">${package.address.address1} - ${package.address.city}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                       </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+<!--  nota: righe o celle dell'etichetta - 4� riga  -->
+            <fo:table text-align="start" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="2.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${uiLabelMap.PartyParty}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="10pt">${package.party.firstName}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+<!--  nota: righe o celle dell'etichetta - 5� riga  -->
+
+            <fo:table text-align="start" table-layout="fixed">
+              <fo:table-column column-width="2.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="4.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="3.00cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always">
+                                <fo:inline font-size="8pt">${uiLabelMap.ManufacturingReference} :</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${uiLabelMap.ManufacturingReference}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+        <#list components as component>
+<!--  nota: righe o celle dell'etichetta - intestazione righe collo  -->
+            <fo:table text-align="left" table-layout="fixed">
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="6.00cm"/>
+              <fo:table-column column-width="2.50cm"/>
+              <fo:table-column column-width="2.50cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="8pt">${uiLabelMap.ProductProductId}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="8pt">${uiLabelMap.CommonDescription}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="8pt">${uiLabelMap.ManufacturingCustomLength}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="8pt">${uiLabelMap.CommonMeasures}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+            <fo:table text-align="left" table-layout="fixed">
+              <fo:table-column column-width="3.00cm"/>
+              <fo:table-column column-width="6.00cm"/>
+              <fo:table-column column-width="2.50cm"/>
+              <fo:table-column column-width="2.50cm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${component.product.productId}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${component.product.internalName}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${component.orderItem.selectedAmount!}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell>
+                            <fo:block line-height="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
+                                <fo:inline font-size="10pt">${component.product.productHeight} x ${component.product.productWidth}</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+
+<!-- fine riquadro -->
+      </#list>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+</fo:flow>
+</fo:page-sequence>
+</#list>
+
+</fo:root>
+</#escape>
+

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain