OFBiz › OFBiz - Commits

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

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

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

jleroux@apache.org
Author: jleroux
Date: Thu Nov 29 13:10:40 2018
New Revision: 1847716

URL: http://svn.apache.org/viewvc?rev=1847716&view=rev
Log:
"Applied fix from trunk for revision: 1847715  "
------------------------------------------------------------------------
r1847715 | jleroux | 2018-11-29 14:09:53 +0100 (jeu. 29 nov. 2018) | 6 lignes

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

Removes AccountingTaxAuthorityCategoryAdvice and usage, now useless

Fixes possible "BigInteger divide by zero" in rateProductTaxCalc
------------------------------------------------------------------------

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

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 29 13:10:40 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,1847670
+/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,1847715

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/config/AccountingUiLabels.xml?rev=1847716&r1=1847715&r2=1847716&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/config/AccountingUiLabels.xml Thu Nov 29 13:10:40 2018
@@ -14828,16 +14828,6 @@
         <value xml:lang="zh">税务机关</value>
         <value xml:lang="zh-TW">稅務機關</value>
     </property>
-    <property key="AccountingTaxAuthorityCategoryAdvice">
-        <value xml:lang="ar">أنتبه: لا تستخدم أكثر من سطر واحد في "شحن الضرائب" و/أو "عروض الضرائب" بالقيمة = "ص"</value>
-        <value xml:lang="de">Achtung: verwenden Sie nicht mehr als eine Zeile mit "Steuer Lieferung" und/oder "Steuer Promotions" Wert = "Y"</value>
-        <value xml:lang="en">Beware: don't use more than one line with "Tax Shipping" and/or "Tax Promotions" value = "Y"</value>
-        <value xml:lang="fr">Attention: n'utilisez pas plus d'une ligne avec "Taxes sur livraison" et/ou "Taxes sur promotions" = "Y"</value>
-        <value xml:lang="ja">注意: "発送税"および/または"プロモーション税"に値="Y"の行を複数使用しないでください</value>
-        <value xml:lang="vi">LÆ°u ý: bạn không sá»­ dụng nhiều hÆ¡n một dòng với "Thuế chuyển hàng" và/hoặc "Thuế khuyến mãi giá trị"= "Y"</value>
-        <value xml:lang="zh">注意："航运税"不能多于一行，且/或"业务推广税"的值 = "Y"</value>
-        <value xml:lang="zh-TW">注意:"航運稅"不能多於一行,且/或"業務推廣稅"的值 = "Y"</value>
-    </property>
     <property key="AccountingTaxAuthorityGeo">
         <value xml:lang="ar">جيوغرافية مصلحة الضرائب</value>
         <value xml:lang="de">Steuerbehörde Geo</value>

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=1847716&r1=1847715&r2=1847716&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 Thu Nov 29 13:10:40 2018
@@ -248,7 +248,7 @@ public class TaxAuthorityServices {
         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);
@@ -272,8 +272,10 @@ public class TaxAuthorityServices {
         // 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 (totalPrice.compareTo(BigDecimal.ZERO) > 0) {
+                BigDecimal weight = value.divide(totalPrice, 100, salestaxRounding);
+                productWeight.put(prod, weight);
+            }
         }
 
         if (orderShippingAmount != null && orderShippingAmount.compareTo(BigDecimal.ZERO) > 0) {
@@ -391,8 +393,6 @@ public class TaxAuthorityServices {
             EntityCondition productCategoryCond;
             productCategoryCond = setProductCategoryCond(delegator, product);
 
-            // FIXME handles shipping and promo tax. Simple solution, see
-            // https://issues.apache.org/jira/browse/OFBIZ-4160 for a better one
             if (product == null && shippingAmount != null) {
                 EntityCondition taxShippingCond = EntityCondition.makeCondition(
                         EntityCondition.makeCondition("taxShipping", EntityOperator.EQUALS, null),

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/TaxAuthorityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/TaxAuthorityScreens.xml?rev=1847716&r1=1847715&r2=1847716&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/TaxAuthorityScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/TaxAuthorityScreens.xml Thu Nov 29 13:10:40 2018
@@ -193,10 +193,8 @@ under the License.
                 <decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.taxAuthDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet id="TaxAuthorityCategoryPanel" title="${uiLabelMap.PageTitleAddTaxAuthorityCategory}" collapsible="true">
-                            <label style="h3">${uiLabelMap.AccountingTaxAuthorityCategoryAdvice}</label>
                             <include-form name="AddTaxAuthorityRateProduct" location="component://accounting/widget/TaxAuthorityForms.xml"/>
                         </screenlet>
-                        <label style="h3">${uiLabelMap.AccountingTaxAuthorityCategoryAdvice}</label>                        
                         <include-form name="ListTaxAuthorityRateProducts" location="component://accounting/widget/TaxAuthorityForms.xml"/>
                     </decorator-section>
                 </decorator-screen>


Free forum by Nabble Edit this page