Can't attach the patch to a closed issue, so have
included here, it's a small one that wont both the mailing list to much I hope! Ray --- "Ray Barlow (JIRA)" <[hidden email]> wrote: > [ > http://issues.apache.org/jira/browse/OFBIZ-466?page=comments#action_12453431 > ] > > Ray Barlow commented on OFBIZ-466: > ---------------------------------- > > Jacopo, > > It looks like the commit has dropped lots of the > ending tags: > > > Not sure why as they are in the > "fo_ftl_escape.patch" patch file?! I've just created > a new patch that shows the outstanding differences > in my local copy that were part of the > "fo_ftl_escape.patch" patch. > > Ray > > > PDF view of order crashes depending on customer > data such as notes and address lines. > > > > > > > Key: OFBIZ-466 > > URL: > http://issues.apache.org/jira/browse/OFBIZ-466 > > Project: OFBiz (The Open for Business > Project) > > Issue Type: Bug > > Components: order > > Affects Versions: SVN trunk > > Environment: N/A > > Reporter: Ray Barlow > > Assigned To: Jacopo Cappellato > > Attachments: fo_ftl_escape.patch, > order_pdf.patch > > > > > > This patch adds a few more ?xml attributes to the > pdf views for orders to stop crashes when trying to > view an order that has xml unfriendly characters > i.e. view the pdf of an order with a customer facing > note saying "Merry Christmas & Happy New Year" > > -- > This message is automatically generated by JIRA. > - > If you think it was sent incorrectly contact one of > the administrators: > > - > For more information on JIRA, see: > http://www.atlassian.com/software/jira > > > =================================================================== --- applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (revision 479307) +++ applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (working copy) @@ -245,3 +245,5 @@ </fo:flow> </fo:page-sequence> </fo:root> +</#escape> + Index: applications/content/webapp/content/fonts.fo.ftl =================================================================== --- applications/content/webapp/content/fonts.fo.ftl (revision 479307) +++ applications/content/webapp/content/fonts.fo.ftl (working copy) @@ -1316,3 +1316,5 @@ </fo:flow> </fo:page-sequence> </fo:root> +</#escape> + Index: applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl =================================================================== --- applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl (revision 479307) +++ applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl (working copy) @@ -117,3 +117,5 @@ </#if> </fo:root> +</#escape> + Index: applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl =================================================================== --- applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl (revision 479307) +++ applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl (working copy) @@ -216,3 +216,5 @@ </fo:page-sequence> </#if> </fo:root> +</#escape> + Index: applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl =================================================================== --- applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl (revision 479307) +++ applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl (working copy) @@ -172,3 +172,5 @@ </fo:block> </#if> </fo:root> +</#escape> + Index: applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl =================================================================== --- applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl (revision 479307) +++ applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl (working copy) @@ -164,3 +164,5 @@ </fo:block> </#if> </fo:root> +</#escape> + Index: applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl =================================================================== --- applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl (revision 479307) +++ applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl (working copy) @@ -139,3 +139,5 @@ </fo:block> </#if> </fo:root> +</#escape> + Index: applications/order/webapp/ordermgr/order/companyHeader.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/order/companyHeader.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/order/companyHeader.fo.ftl (working copy) @@ -102,3 +102,5 @@ </#if> </fo:list-block> </fo:block> +</#escape> + Index: applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (revision 478517) +++ applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (working copy) @@ -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,5 @@ </fo:table-body> </fo:table> </#if> +</#escape> + Index: applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl (working copy) @@ -26,3 +26,5 @@ <#-- Here is a good place to put boilerplate terms and conditions for a purchase order. --> </fo:block> </#if> +</#escape> + Index: applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (working copy) @@ -121,3 +121,5 @@ </fo:table> <fo:block space-after="10pt"/> +</#escape> + Index: applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl (working copy) @@ -43,3 +43,5 @@ </fo:table-row> </fo:table-body> </fo:table> +</#escape> + Index: applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (working copy) @@ -150,3 +150,5 @@ </fo:table> </fo:block> </fo:block> +</#escape> + Index: applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl (working copy) @@ -74,3 +74,5 @@ </fo:table-row> </fo:table-body> </fo:table> +</#escape> + Index: applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl (working copy) @@ -50,3 +50,5 @@ </fo:list-item-body> </fo:list-item> </fo:list-block> +</#escape> + Index: applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl (working copy) @@ -123,3 +123,5 @@ </#if> </fo:root> +</#escape> + Index: applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl (working copy) @@ -133,3 +133,5 @@ </#if> </fo:root> +</#escape> + Index: applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl (working copy) @@ -98,3 +98,5 @@ </#if> </fo:root> +</#escape> + Index: applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl (working copy) @@ -109,3 +109,5 @@ </#if> </fo:root> +</#escape> + Index: applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl =================================================================== --- applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl (revision 479307) +++ applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl (working copy) @@ -67,3 +67,5 @@ </fo:table> <fo:block space-after="10pt"/> +</#escape> + Index: applications/product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl =================================================================== --- applications/product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl (revision 479307) +++ applications/product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl (working copy) @@ -46,3 +46,5 @@ </fo:flow> </fo:page-sequence> </fo:root> +</#escape> + Index: applications/product/webapp/facility/facility/Picklist.fo.ftl =================================================================== --- applications/product/webapp/facility/facility/Picklist.fo.ftl (revision 479307) +++ applications/product/webapp/facility/facility/Picklist.fo.ftl (working copy) @@ -289,3 +289,5 @@ </fo:block> </#if> </fo:root> +</#escape> + Index: applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl =================================================================== --- applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl (revision 479307) +++ applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl (working copy) @@ -52,3 +52,5 @@ </fo:flow> </fo:page-sequence> </fo:root> +</#escape> + Index: applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl =================================================================== --- applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl (revision 479307) +++ applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl (working copy) @@ -203,3 +203,5 @@ </fo:block> </#if> </fo:root> +</#escape> + |
Free forum by Nabble | Edit this page |