Author: jacopoc
Date: Thu Aug 9 05:35:02 2007
New Revision: 564187
URL:
http://svn.apache.org/viewvc?view=rev&rev=564187Log:
Fixed bug reported by Bilgin Ibryam in OFBIZ-1192: error generated by FOP if the list of addresses is null for a sales order.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?view=diff&rev=564187&r1=564186&r2=564187==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Thu Aug 9 05:35:02 2007
@@ -17,8 +17,9 @@
under the License.
-->
<#escape x as x?xml>
+ <#if orderHeader.getString("orderTypeId") == "PURCHASE_ORDER" || orderContactMechValueMaps?has_content>
<fo:table border-spacing="3pt">
- <fo:table-column column-width="3.75in"/>
+ <fo:table-column column-width="3.75in"/>
<fo:table-column column-width="3.75in"/>
<fo:table-body>
<fo:table-row> <#-- this part could use some improvement -->
@@ -73,9 +74,9 @@
</fo:table-row>
</fo:table-body>
</fo:table>
-
<fo:block white-space-collapse="false"> </fo:block>
-
+ </#if>
+
<fo:table border-spacing="3pt">
<fo:table-column column-width="1.75in"/>
<fo:table-column column-width="4.25in"/>