From 5b464e18fc3ec882585bc35acb583df34cf4a933 Mon Sep 17 00:00:00 2001 From: Ricardo Santana Date: Sat, 14 Jan 2023 08:08:00 -0300 Subject: [PATCH] IDEMPIERE-5544 - Fix orders being calculated with wrong tax provider (#1636) --- org.adempiere.base/src/org/compiere/model/MInvoice.java | 2 ++ org.adempiere.base/src/org/compiere/model/MOrder.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/org.adempiere.base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java index 001a3de574..054b94e5be 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoice.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoice.java @@ -2877,6 +2877,8 @@ public class MInvoice extends X_C_Invoice implements DocAction, IDocsPostProcess MInvoiceLine[] lines = getLines(); for (MInvoiceLine line : lines) { + if (line.isDescription()) + continue; MTax tax = new MTax(line.getCtx(), line.getC_Tax_ID(), line.get_TrxName()); MTaxProvider provider = providers.get(tax.getC_TaxProvider_ID()); if (provider == null) diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java index 3eaad6253e..36ab1dd8e3 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrder.java +++ b/org.adempiere.base/src/org/compiere/model/MOrder.java @@ -2912,6 +2912,8 @@ public class MOrder extends X_C_Order implements DocAction MOrderLine[] lines = getLines(); for (MOrderLine line : lines) { + if (line.isDescription()) + continue; MTax tax = new MTax(line.getCtx(), line.getC_Tax_ID(), line.get_TrxName()); MTaxProvider provider = providers.get(tax.getC_TaxProvider_ID()); if (provider == null)