svn commit: r1085701 - /ofbiz/branches/release09.04/applications/accounting/webapp/accounting/main.ftl

Author: jleroux
Date: Sat Mar 26 11:36:07 2011
New Revision: 1085701

URL: http://svn.apache.org/viewvc?rev=1085701&view=rev
Log:
"Applied fix from trunk for revision: 1085697"
------------------------------------------------------------------------
r1085697 | jleroux | 2011-03-26 12:24:38 +0100 (sam., 26 mars 2011) | 6 lines

A patch from Mirko Vogelsmeier "Exception if a description for an item on main.ftl in accounting is null." https://issues.apache.org/jira/browse/OFBIZ-4229 - OFBIZ-4229

In the main.ftl of the accounting-module there are a lot of items listed (like paymentMethodTypes, paymentTypes, ...).
If one of these items does not have a description defined, an Exception is thrown.
As a fallback to the description i did add the Id.
Like if paymentMethodType.description doesnt exists, it gets the paymentMethodType.paymentMethodTypeId.
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release09.04/applications/accounting/webapp/accounting/main.ftl

Modified: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/webapp/accounting/main.ftl?rev=1085701&r1=1085700&r2=1085701&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/accounting/webapp/accounting/main.ftl (original)
+++ ofbiz/branches/release09.04/applications/accounting/webapp/accounting/main.ftl Sat Mar 26 11:36:07 2011
@@ -27,7 +27,7 @@ under the License.
 <ul>
 <li><a href="<@ofbizUrl>FindAgreement</@ofbizUrl>">${uiLabelMap.AccountingAgreementAvailable}</a></li>
 </ul>
-<br/>
+<br />
      </td>
   </tr>
   <tr>
@@ -39,7 +39,7 @@ under the License.
 <ul>
 <li><a href="<@ofbizUrl>FindBillingAccount</@ofbizUrl>">${uiLabelMap.CommonShow} ${uiLabelMap.AccountingCustomer} ${uiLabelMap.AccountingBillingAccount}</a></li>
 </ul>
-<br/>
+<br />
      </td>
   </tr>
 
@@ -52,7 +52,7 @@ under the License.
 <ul>
 <li><a href="<@ofbizUrl>ListFixedAssets</@ofbizUrl>">${uiLabelMap.AccountingShowAllFixedAssets}</a></li>
 </ul>
-<br/>
+<br />
      </td>
   </tr>
 
@@ -63,21 +63,21 @@ under the License.
   <tr valign="top">
 <td>
 <ul>
-<li><a href="<@ofbizUrl>findInvoices?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllInvoices}</a></li>
+<li><a href="<@ofbizUrl>findInvoices?noConditionFind=Y&amp;lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllInvoices}</a></li>
 </ul>
 </td>
 
 <td>
 <ul>
 <#list invoiceTypes as invoiceType>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${invoiceType.get("description",locale)}</a></li>
+<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&amp;invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${invoiceType.get("description",locale)!invoiceType.invoiceTypeId}</a></li>
 </#list>
 </ul>
 </td>
 <td>
 <ul>
 <#list invoiceStatus as status>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${status.get("description",locale)}</a></li>
+<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&amp;statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${status.get("description",locale)!status.statusId}</a></li>
 </#list>
 </ul>
 </td>
@@ -90,14 +90,14 @@ under the License.
 <tr valign="top">
 <td>
 <ul>
-<li><a href="<@ofbizUrl>findPayments?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllPayments}</a></li>
+<li><a href="<@ofbizUrl>findPayments?noConditionFind=Y&amp;lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllPayments}</a></li>
 </ul>
 </td>
 <td>
 
 <ul>
 <#list paymentTypes as paymentType>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentType.get("description",locale)}</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&amp;paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentType.get("description",locale)!paymentType.paymentTypeId}</a></li>
 </#list>
 </ul>
 </td>
@@ -106,7 +106,7 @@ under the License.
 <td>
 <ul>
 <#list paymentMethodTypes as paymentMethodType>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentMethodType.get("description",locale)}</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&amp;paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentMethodType.get("description",locale)!paymentMethodType.paymentMethodTypeId}</a></li>
 </#list>
 </ul>
 </td>
@@ -114,7 +114,7 @@ under the License.
 <td>
 <ul>
 <#list paymentStatus as status>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${status.get("description",locale)}</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&amp;statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${status.get("description",locale)!status.statusId}</a></li>
 </#list>
 </ul>
 </td>