svn commit: r554971 - /ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl

[sichen]

Author: sichen
Date: Tue Jul 10 08:18:17 2007
New Revision: 554971

URL: http://svn.apache.org/viewvc?view=rev&rev=554971
Log:
Fix for return adjustments without amounts

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

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?view=diff&rev=554971&r1=554970&r2=554971
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Tue Jul 10 08:18:17 2007
@@ -31,10 +31,10 @@
         </div></td>
         <#if (adjEditable)>
            <td>
-              <input type="text" class="inputBox" size="8" name="amount_o_${rowCount}" value="${returnAdjustment.amount?string("##0.00")}"/>
+              <input type="text" class="inputBox" size="8" name="amount_o_${rowCount}" value="${returnAdjustment.amount?default(0)?string("##0.00")}"/>
            </td>
         <#else>
-           <td class="tabletextright"><@ofbizCurrency amount=returnAdjustment.amount isoCode=returnHeader.currencyUomId/></td>
+           <td class="tabletextright"><@ofbizCurrency amount=returnAdjustment.amount?default(0) isoCode=returnHeader.currencyUomId/></td>
         </#if>
         <td colspan="2">&nbsp;</td>
         <td><div class="tabletext">
@@ -60,8 +60,7 @@
        </#if>
        <#if (adjEditable)>
            <#assign rowCount = rowCount + 1>
-       </#if>
-       <#assign returnTotal = returnTotal + returnAdjustment.get("amount")>
+       <#assign returnTotal = returnTotal + returnAdjustment.amount?default(0)>
     </tr>    
 </#macro>