Author: jleroux
Date: Tue Oct 10 05:38:09 2006
New Revision: 454722
URL: http://svn.apache.org/viewvc?view=rev&rev=454722
Log:
Correct value in log, this commit completes rateProductTaxCalcForDisplay
returns incorrect priceWithTax (http://issues.apache.org/jira/browse/OFBIZ-164)
And plural for Taxes Autorithies in french
Modified:
incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_fr.properties
incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
Modified:
incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_fr.properties
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_fr.properties?view=diff&rev=454722&r1=454721&r2=454722
==============================================================================
---
incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_fr.properties
(original)
+++
incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_fr.properties
Tue Oct 10 05:38:09 2006
@@ -203,7 +203,7 @@
AccountingStatus=Statut
AccountingSuffixCard=Suffixe sur la carte
AccountingAccount=Compte
-AccountingTaxAuthorities=Administration fiscale
+AccountingTaxAuthorities=Administrations fiscales
AccountingTermTypeId=Identifiant du type de terme
AccountingTextData=Donn\u00e9es de texte
AccountingThruDate=jusqu'\u00e0 la date
Modified:
incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?view=diff&rev=454722&r1=454721&r2=454722
==============================================================================
---
incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
(original)
+++
incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
Tue Oct 10 05:38:09 2006
@@ -109,7 +109,7 @@
BigDecimal adjAmount =
taxAdjustment.getBigDecimal("amount");
taxTotal = taxTotal.add(adjAmount);
priceWithTax =
priceWithTax.add(adjAmount.divide(quantity,salestaxCalcDecimals,salestaxRounding));
- Debug.logInfo("For productId [" + productId + "] added ["
+ adjAmount + "] of tax to price for geoId [" +
taxAdjustment.getString("taxAuthGeoId") + "], new price is [" + priceWithTax +
"]", module);
+ Debug.logInfo("For productId [" + productId + "] added ["
+ adjAmount.divide(quantity,salestaxCalcDecimals,salestaxRounding) + "] of tax
to price for geoId [" + taxAdjustment.getString("taxAuthGeoId") + "], new price
is [" + priceWithTax + "]", module);
}
}
} catch (GenericEntityException e) {
