svn commit: r706807 - in /ofbiz/trunk/applications: accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy

[bibryam]

Author: bibryam
Date: Tue Oct 21 16:04:41 2008
New Revision: 706807

URL: http://svn.apache.org/viewvc?rev=706807&view=rev
Log:
 - Fixed a bug that cause invoice screen to crash when invoice total is negative amount.
 - Invoice links in order view screen, were shown more than once.

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=706807&r1=706806&r2=706807&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Oct 21 16:04:41 2008
@@ -310,7 +310,7 @@
             <condition>
                 <or>
                     <if-compare field="remainingAppliedAmount" operator="greater" value="0.0" type="BigDecimal"/>
-                    <if-compare field="invoiceTotalAmount" operator="equals" value="0.0" type="BigDecimal"/>
+                    <if-compare field="invoiceTotalAmount" operator="less-equals" value="0.0" type="BigDecimal"/>
                     <if-compare-field field="computedTotalAmount" to-field="invoiceTotalAmount" operator="less" type="BigDecimal"/>
                 </or>
             </condition>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=706807&r1=706806&r2=706807&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Tue Oct 21 16:04:41 2008
@@ -158,7 +158,7 @@
     context.itemIssuancesPerItem = itemIssuancesPerItem;
 
     // get a list of all invoices
-    allInvoices = [];
+    allInvoices = new HashSet();
     orderBilling = delegator.findByAnd("OrderItemBilling", [orderId : orderId], ["invoiceId"]);
     orderBilling.each { billingGv ->
         allInvoices.add(billingGv.invoiceId);