Author: arunpatidar
Date: Fri May 20 06:58:28 2016
New Revision: 1744664
URL: http://svn.apache.org/viewvc?rev=1744664&view=rev
Log:
Applied fix from trunk for revision: 1744662
===
[OFBIZ-5935] Added manually calculated sales tax while recalculating tax of
order. Thanks Rohit Koushal for patch and Divesh Dutta for suggestion.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/order/src/org/ofbiz/order/order/OrderServices.java
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 06:58:28 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662
Modified:
ofbiz/branches/release15.12/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1744664&r1=1744663&r2=1744664&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/order/src/org/ofbiz/order/order/OrderServices.java
(original)
+++
ofbiz/branches/release15.12/applications/order/src/org/ofbiz/order/order/OrderServices.java
Fri May 20 06:58:28 2016
@@ -1633,6 +1633,15 @@ public class OrderServices {
}
}
+ // Accumulate the total manually added tax adjustment
+ BigDecimal totalManuallyAddedOrderTax = ZERO;
+ for (GenericValue orderTaxAdjustment : orderTaxAdjustments) {
+ String comment = orderTaxAdjustment.getString("comments");
+ if (orderTaxAdjustment.get("amount") != null && comment !=null &&
comment.startsWith("Added manually by")) {
+ totalManuallyAddedOrderTax =
totalManuallyAddedOrderTax.add(orderTaxAdjustment.getBigDecimal("amount").setScale(taxDecimals,
taxRounding));
+ }
+ }
+
// Recalculate the taxes for the order
BigDecimal totalNewOrderTax = ZERO;
OrderReadHelper orh = new OrderReadHelper(orderHeader);
@@ -1758,6 +1767,11 @@ public class OrderServices {
}
}
}
+
+ // If there is any manually added tax then add it into new system
generated tax.
+ if (totalManuallyAddedOrderTax.compareTo(BigDecimal.ZERO) > 0) {
+ totalNewOrderTax =
totalNewOrderTax.add(totalManuallyAddedOrderTax).setScale(taxDecimals,
taxRounding);
+ }
// Determine the difference between existing and new tax
adjustment totals, if any
BigDecimal orderTaxDifference =
totalNewOrderTax.subtract(totalExistingOrderTax).setScale(taxDecimals,
taxRounding);
