You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2022/09/05 10:11:52 UTC
[ofbiz-framework] branch trunk updated: Fixed: Tax calculation not considering productStoreGroup (OFBIZ-12686)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2bb296de52 Fixed: Tax calculation not considering productStoreGroup (OFBIZ-12686)
2bb296de52 is described below
commit 2bb296de523265603cc828763a48f1730991d40c
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Mon Sep 5 12:09:38 2022 +0200
Fixed: Tax calculation not considering productStoreGroup (OFBIZ-12686)
For Purchase Orders we need to check for the productstore.
Thanks: Ingo
---
.../ofbiz/accounting/tax/TaxAuthorityServices.java | 24 +++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
index 0915d79ea9..485b79dfa6 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
@@ -656,13 +656,23 @@ public class TaxAuthorityServices {
*/
private static GenericValue getProductPrice(Delegator delegator, GenericValue product, GenericValue productStore, String taxAuthGeoId,
String taxAuthPartyId) throws GenericEntityException {
- return EntityQuery.use(delegator).from("ProductPrice")
- .where("productId", product.get("productId"),
- "taxAuthPartyId", taxAuthPartyId,
- "taxAuthGeoId", taxAuthGeoId,
- "productPricePurposeId", "PURCHASE",
- "productStoreGroupId", productStore.get("primaryStoreGroupId"))
- .orderBy("-fromDate").filterByDate().queryFirst();
+ if (productStore != null && UtilValidate.isNotEmpty(productStore.getString("primaryStoreGroupId"))) {
+ return EntityQuery.use(delegator).from("ProductPrice")
+ .where("productId", product.get("productId"),
+ "taxAuthPartyId", taxAuthPartyId,
+ "taxAuthGeoId", taxAuthGeoId,
+ "productPricePurposeId", "PURCHASE",
+ "productStoreGroupId", productStore.get("primaryStoreGroupId"))
+ .orderBy("-fromDate").filterByDate().queryFirst();
+ } else {
+ // Purchase order case
+ return EntityQuery.use(delegator).from("ProductPrice")
+ .where("productId", product.get("productId"),
+ "taxAuthPartyId", taxAuthPartyId,
+ "taxAuthGeoId", taxAuthGeoId,
+ "productPricePurposeId", "PURCHASE")
+ .orderBy("-fromDate").filterByDate().queryFirst();
+ }
}
/**