(cherry picked from commit 5faaef7)

AustinMRooke · phillipuniverse · commit 562723cfe85f · 2014-09-13T17:20:46.000-05:00
diff --git a/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/pricing/service/workflow/FulfillmentItemPricingActivity.java b/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/pricing/service/workflow/FulfillmentItemPricingActivity.java
@@ -199,7 +199,7 @@ protected void fixOrderSavingsRoundingIssues(Order order, Money totalOrderAdjust
         }
 
         Money orderAdjustmentTotal = order.getOrderAdjustmentsValue();
-        Money amountDiff = totalOrderAdjustmentDistributed.subtract(orderAdjustmentTotal);
+        Money amountDiff = orderAdjustmentTotal.subtract(totalOrderAdjustmentDistributed);
 
         if (!(amountDiff.getAmount().compareTo(BigDecimal.ZERO) == 0)) {
             long numApplicationsNeeded = countNumberOfUnits(amountDiff);
@@ -258,7 +258,7 @@ protected Money sumTaxAmount(List<FulfillmentGroupItem> items, Order order) {
 
     public long countNumberOfUnits(Money difference) {
         double numUnits = difference.multiply(Math.pow(10, difference.getCurrency().getDefaultFractionDigits())).doubleValue();
-        return Math.round(numUnits);
+        return Math.round(Math.abs(numUnits));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ protected void fixOrderSavingsRoundingIssues(Order order, Money totalOrderAdjust`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`Money orderAdjustmentTotal = order.getOrderAdjustmentsValue();`
`202`		`- Money amountDiff = totalOrderAdjustmentDistributed.subtract(orderAdjustmentTotal);`
	`202`	`+ Money amountDiff = orderAdjustmentTotal.subtract(totalOrderAdjustmentDistributed);`
`203`	`203`
`204`	`204`	`if (!(amountDiff.getAmount().compareTo(BigDecimal.ZERO) == 0)) {`
`205`	`205`	`long numApplicationsNeeded = countNumberOfUnits(amountDiff);`
`@@ -258,7 +258,7 @@ protected Money sumTaxAmount(List<FulfillmentGroupItem> items, Order order) {`
`258`	`258`
`259`	`259`	`public long countNumberOfUnits(Money difference) {`
`260`	`260`	`double numUnits = difference.multiply(Math.pow(10, difference.getCurrency().getDefaultFractionDigits())).doubleValue();`
`261`		`- return Math.round(numUnits);`
	`261`	`+ return Math.round(Math.abs(numUnits));`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`/**`