You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2006/11/24 07:53:30 UTC
svn commit: r478784 - in /incubator/ofbiz/trunk/applications:
accounting/webapp/accounting/payment/ content/webapp/content/
manufacturing/webapp/manufacturing/jobshopmgt/
manufacturing/webapp/manufacturing/reports/ order/webapp/ordermgr/order/
order/we...
Author: jacopoc
Date: Thu Nov 23 22:53:24 2006
New Revision: 478784
URL: http://svn.apache.org/viewvc?view=rev&rev=478784
Log:
Applied patch from Ray Barlow to insert the escape tag into all fo.ftl files to avoid rendering errors caused by characters not valid for xml that are pulled from the db (OFBIZ-466).
>From now on, it should be considered a good practice to wrap each fo.ftl template inside the tags:
<#escape x as x?xml>
...
</#escape>
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/PRunsComponentsByFeature.fo.ftl
incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl
incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl
incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl
incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl
incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.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/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/returnReportBody.fo.ftl
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportConditions.fo.ftl
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportHeaderInfo.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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl Thu Nov 23 22:53:24 2006
@@ -19,6 +19,7 @@
Note that this must be customized to fit specific check layouts. The layout here is copied
by hand from a real template using a ruler.
-->
+<#escape x as x?xml>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
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">
<!-- defines the layout master -->
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl Thu Nov 23 22:53:24 2006
@@ -1,4 +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">
<#--
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
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 master-name="main"
Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl?view=diff&rev=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl Thu Nov 23 22:53:24 2006
@@ -15,6 +15,7 @@
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>
@@ -221,4 +222,5 @@
</fo:page-sequence>
</#list>
</fo:root>
+</#escape>
Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl?view=diff&rev=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl Thu Nov 23 22:53:24 2006
@@ -15,6 +15,7 @@
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>
@@ -221,4 +222,5 @@
</#list>
</#if>
</fo:root>
+</#escape>
Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl?view=diff&rev=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl Thu Nov 23 22:53:24 2006
@@ -15,6 +15,7 @@
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>
@@ -339,4 +340,5 @@
</#list>
</fo:root>
+</#escape>
Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl?view=diff&rev=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl Thu Nov 23 22:53:24 2006
@@ -15,6 +15,7 @@
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>
@@ -236,4 +237,5 @@
</fo:page-sequence>
</#list>
</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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl Thu Nov 23 22:53:24 2006
@@ -15,6 +15,7 @@
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>
@@ -389,4 +390,5 @@
</#list>
</fo:root>
+</#escape>
Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl?view=diff&rev=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl Thu Nov 23 22:53:24 2006
@@ -15,6 +15,7 @@
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>
@@ -309,4 +310,5 @@
</#list>
</fo:root>
+</#escape>
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,8 @@
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">
<fo:layout-master-set>
<fo:simple-page-master master-name="main" page-height="11.694in" page-width="8.264in"
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,8 @@
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">
<fo:layout-master-set>
<fo:simple-page-master master-name="main" page-height="11.694in" page-width="8.264in"
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,8 @@
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">
<fo:layout-master-set>
<fo:simple-page-master master-name="main" page-height="11in" page-width="8.5in"
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
License for the specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<fo:block text-align="left">
<#if logoImageUrl?has_content><fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px"/></#if>
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
License for the specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<fo:block space-after="40pt"/>
<#if orderHeader.getString("orderTypeId") == "SALES_ORDER">
<fo:block font-size="14pt" font-weight="bold" text-align="center">THANK YOU FOR YOUR PATRONAGE!</fo:block>
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
License for the specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<fo:table border-spacing="3pt">
<fo:table-column column-width="3.75in"/>
<fo:table-column column-width="3.75in"/>
@@ -27,10 +28,10 @@
<fo:table-cell>
<fo:block white-space-collapse="false">
<fo:block font-weight="bold">${uiLabelMap.OrderPurchasedFrom}:</fo:block><#assign postalAddress = supplierGeneralContactMechValueMap.postalAddress><#if postalAddress?has_content><#if postalAddress.toName?has_content>${postalAddress.toName}</#if><#if postalAddress.attnName?has_content>
-${postalAddress.attnName}</#if>
-${postalAddress.address1}<#if postalAddress.address2?has_content>
-${postalAddress.address2}</#if>
-${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if></#if><#if postalAddress.postalCode?has_content>${postalAddress.postalCode}</#if>
+${postalAddress.attnName?if_exists}</#if>
+${postalAddress.address1?if_exists}<#if postalAddress.address2?has_content>
+${postalAddress.address2?if_exists}</#if>
+${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if></#if><#if postalAddress.postalCode?has_content>${postalAddress.postalCode}</#if>
${postalAddress.countryGeoId?if_exists}
</fo:block>
</fo:table-cell>
@@ -52,11 +53,11 @@
<#if contactMech.contactMechTypeId == "POSTAL_ADDRESS">
<fo:table-cell>
<fo:block white-space-collapse="false">
-<fo:block font-weight="bold">${contactMechPurpose.get("description",locale)}: </fo:block><#assign postalAddress = orderContactMechValueMap.postalAddress><#if postalAddress?has_content><#if postalAddress.toName?has_content>${postalAddress.toName}</#if><#if postalAddress.attnName?has_content>
-${postalAddress.attnName}</#if>
-${postalAddress.address1}<#if postalAddress.address2?has_content>
-${postalAddress.address2}</#if>
-${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if></#if><#if postalAddress.postalCode?has_content>${postalAddress.postalCode}</#if>
+<fo:block font-weight="bold">${contactMechPurpose.get("description",locale)}: </fo:block><#assign postalAddress = orderContactMechValueMap.postalAddress><#if postalAddress?has_content><#if postalAddress.toName?has_content>${postalAddress.toName?if_exists}</#if><#if postalAddress.attnName?has_content>
+${postalAddress.attnName?if_exists}</#if>
+${postalAddress.address1?if_exists}<#if postalAddress.address2?has_content>
+${postalAddress.address2?if_exists}</#if>
+${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if></#if><#if postalAddress.postalCode?has_content>${postalAddress.postalCode}</#if>
</fo:block>
</fo:table-cell>
</#if>
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
License for the specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<fo:table>
<fo:table-column column-width="1.5in"/>
<fo:table-column column-width="1.5in"/>
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
License for the specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<fo:block>
<fo:table font-size="9pt">
<fo:table-column column-width="40pt"/>
@@ -55,7 +56,7 @@
<fo:block>${quoteItem.quoteItemSeqId}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${(product.internalName)?xml?if_exists} [${quoteItem.productId?if_exists}]</fo:block>
+ <fo:block>${(product.internalName)?if_exists} [${quoteItem.productId?if_exists}]</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<fo:block text-align="right">${quoteItem.quantity?if_exists}</fo:block>
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,7 +14,7 @@
License for the specific language governing permissions and limitations
under the License.
-->
-
+<#escape x as x?xml>
<fo:table border-spacing="3pt">
<fo:table-column column-width="3.75in"/>
@@ -74,4 +74,3 @@
</fo:table-row>
</fo:table-body>
</fo:table>
-
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
License for the specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<fo:list-block provisional-distance-between-starts="35mm" font-size="10pt">
<fo:list-item>
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl Thu Nov 23 22:53:24 2006
@@ -1,4 +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">
<#--
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl Thu Nov 23 22:53:24 2006
@@ -1,4 +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">
<#--
@@ -94,7 +95,7 @@
<fo:block>${orderPurchaseProductSummary.productId?if_exists}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchaseProductSummary.internalName?xml?if_exists}</fo:block>
+ <fo:block>${orderPurchaseProductSummary.internalName?if_exists}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<fo:block>${orderPurchaseProductSummary.quantity?if_exists}</fo:block>
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl Thu Nov 23 22:53:24 2006
@@ -1,4 +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">
<#--
@@ -59,7 +60,7 @@
<#list productReportList as productReport>
<fo:table-row>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${productReport.internalName?xml?if_exists} (${productReport.productId?if_exists})</fo:block>
+ <fo:block>${productReport.internalName?if_exists} (${productReport.productId?if_exists})</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<fo:block>${productReport.quantity?if_exists}</fo:block>
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl Thu Nov 23 22:53:24 2006
@@ -1,4 +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">
<#--
@@ -35,7 +36,7 @@
<fo:page-sequence master-reference="main">
<fo:flow flow-name="xsl-region-body" font-family="Helvetica">
<fo:block font-size="14pt">${uiLabelMap.OrderReportSalesByStore}</fo:block>
- <#if !showProductStore><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.ProductProductStore}: ${parameters.productStoreId} - ${productReportList.get(0).storeName?xml?if_exists}</fo:block></#if>
+ <#if !showProductStore><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.ProductProductStore}: ${parameters.productStoreId} - ${productReportList.get(0).storeName?if_exists}</fo:block></#if>
<#if !showToParty><fo:block font-size="10pt">${uiLabelMap.PartyParty}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, toPartyId, false)}</fo:block></#if>
<fo:block font-size="10pt">${uiLabelMap.FormFieldTitle_orderStatusId}:
<#if parameters.orderStatusId?has_content>${parameters.orderStatusId}<#else>${uiLabelMap.CommonAny}</#if>
@@ -70,7 +71,7 @@
</fo:table-cell>
</#if>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${productReport.internalName?default("")?xml} (${productReport.productId?if_exists})</fo:block>
+ <fo:block>${productReport.internalName?default("")} (${productReport.productId?if_exists})</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<fo:block>${productReport.quantity?if_exists}</fo:block>
Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl?view=diff&rev=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
License for the specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<#macro displayReturnAdjustment returnAdjustment>
<#assign returnHeader = returnAdjustment.getRelatedOne("ReturnHeader")>
<#assign adjReturnType = returnAdjustment.getRelatedOne("ReturnType")?if_exists>
@@ -111,4 +112,5 @@
</fo:table-row>
</fo:table-body>
</fo:table>
+</#escape>
Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportConditions.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportConditions.fo.ftl?view=diff&rev=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportConditions.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportConditions.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,8 +14,10 @@
License for the specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<fo:block space-after="40pt"/>
<fo:block font-size="8pt">
Here is a good place to put boilerplate terms and conditions for a return.
</fo:block>
+</#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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
License for the specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<#assign fromPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", returnHeader.fromPartyId, "compareDate", returnHeader.entryDate, "userLogin", userLogin))/>
<#assign toPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", returnHeader.toPartyId, "compareDate", returnHeader.entryDate, "userLogin", userLogin))/>
Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportHeaderInfo.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportHeaderInfo.fo.ftl?view=diff&rev=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportHeaderInfo.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportHeaderInfo.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
License for the specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<fo:table><fo:table-column column-width="0.3in"/><fo:table-body><fo:table-row><fo:table-cell>
<fo:table font-size="10pt">
<fo:table-column column-width="1in"/>
@@ -53,4 +54,5 @@
</fo:table-body></fo:table>
</fo:table-cell></fo:table-row></fo:table-body></fo:table>
+</#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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl Thu Nov 23 22:53:24 2006
@@ -1,4 +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">
<#--
@@ -28,7 +29,7 @@
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<#if product?has_content>
- <fo:block>${product.internalName?xml?default("Internal Name Not Set!")} [${product.productId}]</fo:block>
+ <fo:block>${product.internalName?default("Internal Name Not Set!")} [${product.productId}]</fo:block>
<#else>
<fo:block> </fo:block>
</#if>
@@ -66,7 +67,7 @@
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<#if product?has_content>
- <fo:block>${product.internalName?xml?default("Internal Name Not Set!")} [${product.productId}]</fo:block>
+ <fo:block>${product.internalName?default("Internal Name Not Set!")} [${product.productId}]</fo:block>
<#else>
<fo:block> </fo:block>
</#if>
@@ -232,7 +233,7 @@
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<#if product?has_content>
- <fo:block>${product.internalName?xml?default("Internal Name Not Set!")} [${product.productId}]</fo:block>
+ <fo:block>${product.internalName?default("Internal Name Not Set!")} [${product.productId}]</fo:block>
<#else/>
<fo:block> </fo:block>
</#if>
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl Thu Nov 23 22:53:24 2006
@@ -21,6 +21,7 @@
and rename the ZIP file that comes with it as jimi-xxx.jar, then copy it into the same directory as fop.jar, which at this time
is ${ofbiz.home}/framework/webapp/lib/ -->
+<#escape x as x?xml>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
<#-- these margins are arbitrary, please redefine as you see fit -->
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl Thu Nov 23 22:53:24 2006
@@ -1,4 +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">
<#--
@@ -125,7 +126,7 @@
<fo:table-row>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<#if product?has_content>
- <fo:block>${product.internalName?default("Internal Name Not Set!")?xml} [${product.productId}]</fo:block>
+ <fo:block>${product.internalName?default("Internal Name Not Set!")} [${product.productId}]</fo:block>
<#else/>
<fo:block> </fo:block>
</#if>
@@ -177,4 +178,5 @@
</#if>
</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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl Thu Nov 23 22:53:24 2006
@@ -1,4 +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">
<#--
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=478784&r1=478783&r2=478784
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl Thu Nov 23 22:53:24 2006
@@ -14,6 +14,7 @@
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">
<fo:layout-master-set>
<fo:simple-page-master master-name="main" page-height="11in" page-width="8.5in"