svn commit: r833918 - /ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl

[jacopoc]

Author: jacopoc
Date: Sun Nov  8 19:37:05 2009
New Revision: 833918

URL: http://svn.apache.org/viewvc?rev=833918&view=rev
Log:
Hidden the "Description" label if the invoice description is empty; also fixed a NPE check.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl?rev=833918&r1=833917&r2=833918&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl Sun Nov  8 19:37:05 2009
@@ -34,7 +34,7 @@
 
 <fo:table-row>
   <fo:table-cell><fo:block>${uiLabelMap.AccountingCustNr}:</fo:block></fo:table-cell>
-  <fo:table-cell><fo:block><#if invoice?has_content>${billingParty.partyId}</#if></fo:block></fo:table-cell>
+  <fo:table-cell><fo:block><#if billingParty?has_content>${billingParty.partyId}</#if></fo:block></fo:table-cell>
 </fo:table-row>
 
 <#if billingPartyTaxId?has_content>
@@ -48,10 +48,12 @@
   <fo:table-cell><fo:block>${uiLabelMap.AccountingInvNr}:</fo:block></fo:table-cell>
   <fo:table-cell><fo:block><#if invoice?has_content>${invoice.invoiceId}</#if></fo:block></fo:table-cell>
 </fo:table-row>
-<fo:table-row>
-  <fo:table-cell><fo:block>${uiLabelMap.AccountingDescr}:</fo:block></fo:table-cell>
-  <fo:table-cell><fo:block><#if invoice?has_content>${invoice.description?if_exists}</#if></fo:block></fo:table-cell>
-</fo:table-row>
+<#if invoice?has_content && invoice.description?has_content>
+  <fo:table-row>
+    <fo:table-cell><fo:block>${uiLabelMap.AccountingDescr}:</fo:block></fo:table-cell>
+    <fo:table-cell><fo:block>${invoice.description}</fo:block></fo:table-cell>
+  </fo:table-row>
+</#if>
 
 <!--fo:table-row>
   <fo:table-cell><fo:block>${uiLabelMap.CommonStatus}</fo:block></fo:table-cell>