svn commit: r479323 - in /incubator/ofbiz/trunk/applica
Locked
svn commit: r479323 - in /incubator/ofbiz/trunk/applica
 
|
Author: jacopoc
Date: Sun Nov 26 02:00:04 2006 New Revision: 479323 URL: http://svn.apache.org/viewvc?view=rev&rev=479323 Log: Added missing end tags (due to a mysterious issue with my ide that did not applied the mods to the last line of some files) to escape xml chars in ftl.fo templates: thanks to Ray Barlow for the review/report/patch. Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl incubator/ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.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/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl incubator/ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl Sun Nov 26 02:00:04 2006 @@ -245,3 +245,4 @@ </fo:flow> </fo:page-sequence> </fo:root> +</#escape> Modified: incubator/ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl Sun Nov 26 02:00:04 2006 @@ -1316,3 +1316,4 @@ </fo:flow> </fo:page-sequence> </fo:root> +</#escape> 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=479323&r1=479322&r2=479323 ============================================================================== --- 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 02:00:04 2006 @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<#escape x as x?xml> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <#-- Copyright 2001-2006 The Apache Software Foundation @@ -19,6 +17,7 @@ under the License. --> +<#escape x as x?xml> <#-- do not display columns associated with values specified in the request, ie constraint values --> <#--<#assign showProductStore = !parameters.productStoreId?has_content>--> <fo:layout-master-set> @@ -117,3 +116,4 @@ </#if> </fo:root> +</#escape> \ No newline at end of file Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl Sun Nov 26 02:00:04 2006 @@ -216,3 +216,4 @@ </fo:page-sequence> </#if> </fo:root> +</#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=479323&r1=479322&r2=479323 ============================================================================== --- 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 02:00:04 2006 @@ -31,7 +31,6 @@ <#list stackInfos as stackInfo> <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"> @@ -63,7 +62,7 @@ <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 --> +<!-- nota: righe o celle di testata - 1� riga intestazione --> <fo:table text-align="center" table-layout="fixed"> <fo:table-column column-width="4.00cm"/> @@ -95,7 +94,7 @@ </fo:table-row> </fo:table-body> </fo:table> -<!-- nota: righe o celle di testata - 1° riga valore --> +<!-- 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"/> @@ -127,7 +126,7 @@ </fo:table-body> </fo:table> -<!-- nota: righe o celle di testata - 2° riga intestazioni --> +<!-- nota: righe o celle di testata - 2� riga intestazioni --> <fo:table text-align="center" table-layout="fixed"> <fo:table-column column-width="4.00cm"/> @@ -159,7 +158,7 @@ </fo:table-row> </fo:table-body> </fo:table> -<!-- nota: righe o celle di testata - 2° riga valori --> +<!-- 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"/> @@ -199,7 +198,7 @@ </fo:table-body> </fo:table> -<!-- nota: righe o celle di testata - 3° riga intestazioni --> +<!-- nota: righe o celle di testata - 3� riga intestazioni --> <fo:table text-align="center" table-layout="fixed"> <fo:table-column column-width="2.50cm"/> @@ -243,7 +242,6 @@ </fo:table-body> </fo:table> -<!-- nota: righe o celle di testata - 3° riga valori --> <fo:table text-align="center" table-layout="fixed"> <fo:table-column column-width="2.50cm"/> @@ -293,7 +291,7 @@ </fo:table-body> </fo:table> -<!-- nota: righe o celle di testata - 4° riga valori (numero etichette) --> +<!-- 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"/> @@ -314,7 +312,7 @@ </fo:table-body> </fo:table> -<!-- nota: righe o celle di testata - 5° riga labels (riga del codice) --> +<!-- 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"/> @@ -346,7 +344,7 @@ </fo:table-row> </fo:table-body> </fo:table> -<!-- nota: righe o celle di testata - 5° riga value (riga del codice) --> +<!-- 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"/> Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl Sun Nov 26 02:00:04 2006 @@ -172,3 +172,4 @@ </fo:block> </#if> </fo:root> +</#escape> Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl Sun Nov 26 02:00:04 2006 @@ -164,3 +164,4 @@ </fo:block> </#if> </fo:root> +</#escape> Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl Sun Nov 26 02:00:04 2006 @@ -139,3 +139,4 @@ </fo:block> </#if> </fo:root> +</#escape> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl Sun Nov 26 02:00:04 2006 @@ -102,3 +102,4 @@ </#if> </fo:list-block> </fo:block> +</#escape> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl Sun Nov 26 02:00:04 2006 @@ -14,6 +14,7 @@ License for the specific language governing permissions and limitations under the License. --> +<#escape x as x?xml> <#if orderHeader?has_content> <fo:table border-spacing="3pt"> @@ -41,11 +42,11 @@ <fo:table-cell> <fo:block> <#if productId?exists> - ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?xml?if_exists} + ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists} <#elseif orderItemType?exists> - ${orderItemType.get("description",locale)} - ${orderItem.itemDescription?xml?if_exists} + ${orderItemType.get("description",locale)} - ${orderItem.itemDescription?if_exists} <#else> - ${orderItem.itemDescription?xml?if_exists} + ${orderItem.itemDescription?if_exists} </#if> </fo:block> </fo:table-cell> @@ -143,3 +144,4 @@ </fo:table-body> </fo:table> </#if> +</#escape> \ No newline at end of file Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl Sun Nov 26 02:00:04 2006 @@ -26,3 +26,4 @@ <#-- Here is a good place to put boilerplate terms and conditions for a purchase order. --> </fo:block> </#if> +</#escape> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Sun Nov 26 02:00:04 2006 @@ -121,3 +121,4 @@ </fo:table> <fo:block space-after="10pt"/> +</#escape> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl Sun Nov 26 02:00:04 2006 @@ -43,3 +43,4 @@ </fo:table-row> </fo:table-body> </fo:table> +</#escape> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Sun Nov 26 02:00:04 2006 @@ -150,3 +150,4 @@ </fo:table> </fo:block> </fo:block> +</#escape> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl Sun Nov 26 02:00:04 2006 @@ -74,3 +74,4 @@ </fo:table-row> </fo:table-body> </fo:table> +</#escape> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl Sun Nov 26 02:00:04 2006 @@ -50,3 +50,4 @@ </fo:list-item-body> </fo:list-item> </fo:list-block> +</#escape> 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=479323&r1=479322&r2=479323 ============================================================================== --- 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 02:00:04 2006 @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8" ?> -<#escape x as x?xml> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <#-- @@ -19,6 +18,8 @@ under the License. --> +<#escape x as x?xml> + <#-- do not display columns associated with values specified in the request, ie constraint values --> <#assign showProductStore = !parameters.productStoreId?has_content> <#assign showOriginFacility = !parameters.originFacilityId?has_content> @@ -123,3 +124,4 @@ </#if> </fo:root> +</#escape> 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=479323&r1=479322&r2=479323 ============================================================================== --- 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 02:00:04 2006 @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8" ?> -<#escape x as x?xml> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <#-- @@ -19,6 +18,8 @@ under the License. --> +<#escape x as x?xml> + <#-- do not display columns associated with values specified in the request, ie constraint values --> <#assign showProductStore = !parameters.productStoreId?has_content> <#assign showOriginFacility = !parameters.originFacilityId?has_content> @@ -133,3 +134,4 @@ </#if> </fo:root> +</#escape> 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=479323&r1=479322&r2=479323 ============================================================================== --- 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 02:00:04 2006 @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8" ?> -<#escape x as x?xml> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <#-- @@ -18,6 +17,8 @@ under the License. --> +<#escape x as x?xml> + <#-- do not display columns associated with values specified in the request, ie constraint values --> <#assign showToParty = !parameters.toPartyId?has_content> <#assign showFromParty = !parameters.fromPartyId?has_content> @@ -98,3 +99,5 @@ </#if> </fo:root> + +</#escape> 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=479323&r1=479322&r2=479323 ============================================================================== --- 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 02:00:04 2006 @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8" ?> -<#escape x as x?xml> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <#-- @@ -18,6 +17,8 @@ under the License. --> +<#escape x as x?xml> + <#-- do not display columns associated with values specified in the request, ie constraint values --> <#assign showProductStore = !parameters.productStoreId?has_content> <#assign showToParty = !parameters.toPartyId?has_content> @@ -109,3 +110,5 @@ </#if> </fo:root> + +</#escape> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl Sun Nov 26 02:00:04 2006 @@ -67,3 +67,4 @@ </fo:table> <fo:block space-after="10pt"/> +</#escape> 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=479323&r1=479322&r2=479323 ============================================================================== --- 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 02:00:04 2006 @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8" ?> -<#escape x as x?xml> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <#-- @@ -18,6 +17,8 @@ under the License. --> +<#escape x as x?xml> + <#macro pickInfoDetail pickQuantity picklistBinInfoList product facilityLocation facilityLocationInfo> <fo:table-row> <fo:table-cell padding="2pt" background-color="${rowColor}"> @@ -289,3 +290,4 @@ </fo:block> </#if> </fo:root> +</#escape> Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl Sun Nov 26 02:00:04 2006 @@ -46,3 +46,4 @@ </fo:flow> </fo:page-sequence> </fo:root> +</#escape> 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=479323&r1=479322&r2=479323 ============================================================================== --- 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 02:00:04 2006 @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8" ?> -<#escape x as x?xml> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <#-- @@ -19,6 +18,8 @@ under the License. --> +<#escape x as x?xml> + <fo:layout-master-set> <fo:simple-page-master master-name="main" page-height="11in" page-width="8.5in" margin-top="0.5in" margin-bottom="1in" margin-left="1in" margin-right="1in"> @@ -179,4 +180,3 @@ </fo:root> </#escape> - 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=479323&r1=479322&r2=479323 ============================================================================== --- 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 02:00:04 2006 @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8" ?> -<#escape x as x?xml> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <#-- @@ -19,6 +18,8 @@ under the License. --> +<#escape x as x?xml> + <fo:layout-master-set> <fo:simple-page-master master-name="main" page-height="4in" page-width="8in" margin-top="0.5in" margin-bottom="0.25in" margin-left="0.25in" margin-right="0.25in"> @@ -52,3 +53,4 @@ </fo:flow> </fo:page-sequence> </fo:root> +</#escape> Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl?view=diff&rev=479323&r1=479322&r2=479323 ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl Sun Nov 26 02:00:04 2006 @@ -203,3 +203,4 @@ </fo:block> </#if> </fo:root> +</#escape> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |