svn commit: r594434 - /ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl

[sichen]

Author: sichen
Date: Mon Nov 12 20:50:39 2007
New Revision: 594434

URL: http://svn.apache.org/viewvc?rev=594434&view=rev
Log:
prevent potential problems from a null ReturnAdjustment.amount

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl?rev=594434&r1=594433&r2=594434&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl Mon Nov 12 20:50:39 2007
@@ -30,7 +30,9 @@
     </fo:table-cell>
     <fo:table-cell padding="1mm" text-align="right"><fo:block><@ofbizCurrency amount=returnAdjustment.amount isoCode=returnHeader.currencyUomId/></fo:block></fo:table-cell>
     </fo:table-row>
-    <#assign total = total + returnAdjustment.get("amount")>
+    <#if returnAdjustment.amount?has_content>
+         <#assign total = total + returnAdjustment.get("amount")>
+    </#if>
 </#macro>
 
       <#-- Items returned -->