svn commit: r1847671 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java

Author: jleroux
Date: Wed Nov 28 19:29:54 2018
New Revision: 1847671

URL: http://svn.apache.org/viewvc?rev=1847671&view=rev
Log:
"Applied fix from trunk for revision: 1847670  "
------------------------------------------------------------------------
r1847670 | jleroux | 2018-11-28 20:29:04 +0100 (mer. 28 nov. 2018) | 20 lignes

Fixed: Tax not added for order shipping or promotion
(OFBIZ-4160)

The r1070830 commit works fine. Except when there are shippings and promotions
to calculate. Then the algorithm searches for all entries in
TAX_AUTHORITY_RATE_PRODUCT that are available for the PRODUCT_STORE and
TAX_AUTH (and apply to shipping/promotions). So all taxes (regular and reduced)
are applied to the shipping costs, which naturally leads to a higher
amount overall.

The correct procedure (at least in some countries in Europe) is to apply the
tax for shipping  according to the shipped items. So, if regular tax applies
to the good, regular tax is applied to the shipping-costs. If multiple items are
shipped and they  have mixed taxes (some regular, some reduced) the calculation
of the tax for shipping is weighted accordingly.

jleroux: there are other ways to calculate VAT on shipping depending on
countries and situations. This will be addressed by OFBIZ-10679

Thanks: Benjamin Jugl
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 28 19:29:54 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847670

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1847671&r1=1847670&r2=1847671&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java Wed Nov 28 19:29:54 2018
@@ -245,29 +245,47 @@ public class TaxAuthorityServices {
         List<GenericValue> orderAdjustments = new LinkedList<>();
         List<List<GenericValue>> itemAdjustments = new LinkedList<>();
 
+        BigDecimal totalPrice = ZERO_BASE;
+        Map<GenericValue,BigDecimal> productWeight = new HashMap<>();
         // Loop through the products; get the taxCategory; and lookup each in the cache.
-        for (int i = 0; i < itemProductList.size(); i++) {
+        for (int i = 0; i < itemProductList.size(); i++) {  
             GenericValue product = itemProductList.get(i);
             BigDecimal itemAmount = itemAmountList.get(i);
             BigDecimal itemPrice = itemPriceList.get(i);
             BigDecimal itemQuantity = itemQuantityList != null ? itemQuantityList.get(i) : null;
             BigDecimal shippingAmount = itemShippingList != null ? itemShippingList.get(i) : null;
-
+            
+            totalPrice = totalPrice.add(itemAmount);
+            
             List<GenericValue> taxList = getTaxAdjustments(delegator, product, productStore, payToPartyId,
                     billToPartyId, taxAuthoritySet, itemPrice, itemQuantity, itemAmount, shippingAmount, ZERO_BASE);
 
             // this is an add and not an addAll because we want a List of Lists of
             // GenericValues, one List of Adjustments per item
             itemAdjustments.add(taxList);
+            
+            //Calculates the TotalPrices for each Product in the Order
+            BigDecimal currentTotalPrice =  productWeight.containsKey(product) ? productWeight.get(product) : BigDecimal.ZERO;
+            currentTotalPrice = currentTotalPrice.add(itemAmount);
+            productWeight.put(product, currentTotalPrice);
+        }
+        // converts the totals of the products into percent weights
+        for (GenericValue prod : productWeight.keySet()) {
+            BigDecimal value = productWeight.get(prod);
+            BigDecimal weight = value.divide(totalPrice, 100, salestaxRounding);
+            productWeight.put(prod, weight);
         }
+
         if (orderShippingAmount != null && orderShippingAmount.compareTo(BigDecimal.ZERO) > 0) {
-            List<GenericValue> taxList = getTaxAdjustments(delegator, null, productStore, payToPartyId, billToPartyId,
-                    taxAuthoritySet, ZERO_BASE, ZERO_BASE, ZERO_BASE, orderShippingAmount, ZERO_BASE);
-            orderAdjustments.addAll(taxList);
+           for (GenericValue prod : productWeight.keySet()) {
+               List<GenericValue> taxList = getTaxAdjustments(delegator, prod, productStore, payToPartyId, billToPartyId,
+                       taxAuthoritySet, ZERO_BASE, ZERO_BASE, ZERO_BASE, orderShippingAmount, null, productWeight.get(prod));
+               orderAdjustments.addAll(taxList);
+           }
         }
         if (orderPromotionsAmount != null && orderPromotionsAmount.compareTo(BigDecimal.ZERO) != 0) {
             List<GenericValue> taxList = getTaxAdjustments(delegator, null, productStore, payToPartyId, billToPartyId,
-                    taxAuthoritySet, ZERO_BASE, ZERO_BASE, ZERO_BASE, ZERO_BASE, orderPromotionsAmount);
+                    taxAuthoritySet, ZERO_BASE, ZERO_BASE, ZERO_BASE, null, orderPromotionsAmount);
             orderAdjustments.addAll(taxList);
         }
 
@@ -315,9 +333,23 @@ public class TaxAuthorityServices {
             String payToPartyId, String billToPartyId, Set<GenericValue> taxAuthoritySet,
             BigDecimal itemPrice, BigDecimal itemQuantity, BigDecimal itemAmount,
             BigDecimal shippingAmount, BigDecimal orderPromotionsAmount) {
+            return getTaxAdjustments(delegator, product, productStore, payToPartyId, billToPartyId,
+                    taxAuthoritySet, itemPrice, itemQuantity, itemAmount, shippingAmount,
+                    orderPromotionsAmount, null);
+    }
+
+    private static List<GenericValue> getTaxAdjustments(Delegator delegator, GenericValue product,
+            GenericValue productStore,
+            String payToPartyId, String billToPartyId, Set<GenericValue> taxAuthoritySet,
+            BigDecimal itemPrice, BigDecimal itemQuantity, BigDecimal itemAmount,
+            BigDecimal shippingAmount, BigDecimal orderPromotionsAmount, BigDecimal weight) {
         Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
         List<GenericValue> adjustments = new LinkedList<>();
-
+        
+        if (weight == null) {
+            weight = BigDecimal.ONE;
+        }
+        
         if (payToPartyId == null) {
             if (productStore != null) {
                 payToPartyId = productStore.getString("payToPartyId");
@@ -405,6 +437,7 @@ public class TaxAuthorityServices {
             for (GenericValue taxAuthorityRateProduct : lookupList) {
                 BigDecimal taxRate = taxAuthorityRateProduct.get("taxPercentage") != null ? taxAuthorityRateProduct
                         .getBigDecimal("taxPercentage") : ZERO_BASE;
+                taxRate = taxRate.multiply(weight);
                 BigDecimal taxable = ZERO_BASE;
 
                 if (product != null && (product.get("taxable") == null || (product.get("taxable") != null && product