svn commit: r1759339 - /ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java

[diveshdutta]

Author: diveshdutta
Date: Mon Sep  5 18:29:50 2016
New Revision: 1759339

URL: http://svn.apache.org/viewvc?rev=1759339&view=rev
Log:
[OFBIZ-7440] Not donation amount over sales order will not get pro-rated based on shipped quantity in case of partial shipments. Thanks Swapnil Shah for reoprting the issue and Ankush Upadhyay for providing the patch.

Modified:
    ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java

Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java?rev=1759339&r1=1759338&r2=1759339&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java Mon Sep  5 18:29:50 2016
@@ -669,7 +669,7 @@ public class InvoiceServices {
 //                    continue;
 //                }
                 // If the absolute invoiced amount >= the abs of the adjustment amount, the full amount has already been invoiced, so skip this adjustment
-                if (adjAlreadyInvoicedAmount.abs().compareTo(adj.getBigDecimal("amount").setScale(invoiceTypeDecimals, ROUNDING).abs()) > 0) {
+                if (adjAlreadyInvoicedAmount.abs().compareTo(adj.getBigDecimal("amount").setScale(invoiceTypeDecimals, ROUNDING).abs()) >= 0) {
                     continue;
                 }
 
@@ -2289,8 +2289,9 @@ public class InvoiceServices {
 
             // pro-rate the amount
             BigDecimal amount = ZERO;
-            // make sure the divisor is not 0 to avoid NaN problems; just leave the amount as 0 and skip it in essense
-            if (divisor.signum() != 0) {
+            if("DONATION_ADJUSTMENT".equals(adj.getString("orderAdjustmentTypeId"))) {
+             amount=baseAmount;
+            } else if (divisor.signum() != 0) { // make sure the divisor is not 0 to avoid NaN problems; just leave the amount as 0 and skip it in essense
                 // multiply first then divide to avoid rounding errors
                 amount = baseAmount.multiply(multiplier).divide(divisor, decimals, rounding);
             }