svn commit: r479529 - in /incubator/ofbiz/trunk/applications: accounting/webapp/accounting/invoice/ manufacturing/webapp/manufacturing/jobshopmgt/ manufacturing/webapp/manufacturing/reports/ order/webapp/ordermgr/reports/ product/webapp/facility/facili...

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

svn commit: r479529 - in /incubator/ofbiz/trunk/applications: accounting/webapp/accounting/invoice/ manufacturing/webapp/manufacturing/jobshopmgt/ manufacturing/webapp/manufacturing/reports/ order/webapp/ordermgr/reports/ product/webapp/facility/facili...

jacopoc
Author: jacopoc
Date: Sun Nov 26 23:27:54 2006
New Revision: 479529

URL: http://svn.apache.org/viewvc?view=rev&rev=479529
Log:
More cleanups to the fo.ftl files after my last commit; many thanks to Ray Barlow for his reviews and help.

Modified:
    incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl
    incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
    incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
    incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl

Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl?view=diff&rev=479529&r1=479528&r2=479529
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl Sun Nov 26 23:27:54 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <#--
 Copyright 2001-2006 The Apache Software Foundation
 
@@ -13,7 +14,6 @@
 License for the specific language governing permissions and limitations
 under the License.
 -->
-<?xml version="1.0" encoding="UTF-8" ?>
 <#escape x as x?xml>
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
     <#-- master layout specifies the overall layout of the pages and its different sections. -->

Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl?view=diff&rev=479529&r1=479528&r2=479529
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl Sun Nov 26 23:27:54 2006
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 <#--
 
 Copyright 2001-2006 The Apache Software Foundation
@@ -18,6 +17,7 @@
 -->
 
 <#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 <#-- do not display columns associated with values specified in the request, ie constraint values -->
 <#--<#assign showProductStore = !parameters.productStoreId?has_content>-->
 <fo:layout-master-set>
@@ -116,4 +116,4 @@
 </#if>
 
 </fo:root>
-</#escape>
\ No newline at end of file
+</#escape>

Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl?view=diff&rev=479529&r1=479528&r2=479529
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl Sun Nov 26 23:27:54 2006
@@ -35,34 +35,17 @@
         <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.C
           
             </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">
 
-<!--  nota: titolo    -->
-<!--        <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> -->
+        <fo:flow flow-name="xsl-region-body">
 
-<!--
-            <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: righe o celle di testata - 1� riga intestazione  -->
 
             <fo:table text-align="center" table-layout="fixed">
               <fo:table-column column-width="4.00cm"/>
@@ -94,7 +77,7 @@
                     </fo:table-row>
                 </fo:table-body>
             </fo:table>
-<!--  nota: righe o celle di testata - 1� riga valore  -->
+
             <fo:table text-align="center" table-layout="fixed">
               <fo:table-column column-width="4.00cm"/>
               <fo:table-column column-width="2.00cm"/>
@@ -126,7 +109,6 @@
                 </fo:table-body>
             </fo:table>
 
-<!--  nota: righe o celle di testata - 2� riga intestazioni  -->
 
             <fo:table text-align="center" table-layout="fixed">
               <fo:table-column column-width="4.00cm"/>
@@ -158,7 +140,7 @@
                     </fo:table-row>
                 </fo:table-body>
             </fo:table>
-<!--  nota: righe o celle di testata - 2� riga valori  -->
+
             <fo:table text-align="center" table-layout="fixed">
               <fo:table-column column-width="4.00cm"/>
               <fo:table-column column-width="2.00cm"/>
@@ -198,7 +180,6 @@
                 </fo:table-body>
             </fo:table>
 
-<!--  nota: righe o celle di testata - 3� riga intestazioni  -->
 
             <fo:table text-align="center" table-layout="fixed">
               <fo:table-column column-width="2.50cm"/>
@@ -291,7 +272,6 @@
                 </fo:table-body>
             </fo:table>
 
-<!--  nota: righe o celle di testata - 4� riga valori (numero etichette)  -->
 
             <fo:table text-align="left" table-layout="fixed">
               <fo:table-column column-width="5.00cm"/>
@@ -312,7 +292,6 @@
                 </fo:table-body>
             </fo:table>
 
-<!--  nota: righe o celle di testata - 5� riga labels (riga del codice)  -->
 
             <fo:table text-align="center" table-layout="fixed">
               <fo:table-column column-width="3.00cm"/>
@@ -344,7 +323,7 @@
                     </fo:table-row>
                 </fo:table-body>
             </fo:table>
-<!--  nota: righe o celle di testata - 5� riga value (riga del codice)  -->
+
             <fo:table text-align="left" table-layout="fixed">
               <fo:table-column column-width="3.00cm"/>
               <fo:table-column column-width="8.00cm"/>
@@ -376,7 +355,6 @@
                 </fo:table-body>
             </fo:table>
 
-<!-- fine riquadro -->
                         </fo:table-cell>
                     </fo:table-row>
                 </fo:table-body>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl?view=diff&rev=479529&r1=479528&r2=479529
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl Sun Nov 26 23:27:54 2006
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-
 <#--
 
 Copyright 2001-2006 The Apache Software Foundation
@@ -19,6 +17,7 @@
 -->
 
 <#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
 <#-- do not display columns associated with values specified in the request, ie constraint values -->
 <#assign showProductStore = !parameters.productStoreId?has_content>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl?view=diff&rev=479529&r1=479528&r2=479529
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl Sun Nov 26 23:27:54 2006
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-
 <#--
 
 Copyright 2001-2006 The Apache Software Foundation
@@ -19,6 +17,7 @@
 -->
 
 <#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
 <#-- do not display columns associated with values specified in the request, ie constraint values -->
 <#assign showProductStore = !parameters.productStoreId?has_content>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl?view=diff&rev=479529&r1=479528&r2=479529
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl Sun Nov 26 23:27:54 2006
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-
 <#--
 Copyright 2001-2006 The Apache Software Foundation
 
@@ -18,6 +16,7 @@
 -->
 
 <#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
 <#-- do not display columns associated with values specified in the request, ie constraint values -->
 <#assign showToParty = !parameters.toPartyId?has_content>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl?view=diff&rev=479529&r1=479528&r2=479529
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl Sun Nov 26 23:27:54 2006
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-
 <#--
 Copyright 2001-2006 The Apache Software Foundation
 
@@ -18,6 +16,7 @@
 -->
 
 <#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
 <#-- do not display columns associated with values specified in the request, ie constraint values -->
 <#assign showProductStore = !parameters.productStoreId?has_content>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl?view=diff&rev=479529&r1=479528&r2=479529
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl Sun Nov 26 23:27:54 2006
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-
 <#--
 Copyright 2001-2006 The Apache Software Foundation
 
@@ -18,6 +16,7 @@
 -->
 
 <#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
 <#macro pickInfoDetail pickQuantity picklistBinInfoList product facilityLocation facilityLocationInfo>
     <fo:table-row>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl?view=diff&rev=479529&r1=479528&r2=479529
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl Sun Nov 26 23:27:54 2006
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-
 <#--
 
 Copyright 2001-2006 The Apache Software Foundation
@@ -19,6 +17,7 @@
 -->
 
 <#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
 <fo:layout-master-set>
     <fo:simple-page-master master-name="main" page-height="11in" page-width="8.5in"

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl?view=diff&rev=479529&r1=479528&r2=479529
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl Sun Nov 26 23:27:54 2006
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-
 <#--
 
 Copyright 2001-2006 The Apache Software Foundation
@@ -19,6 +17,7 @@
 -->
 
 <#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
     <fo:layout-master-set>
         <fo:simple-page-master master-name="main" page-height="4in" page-width="8in"