From 225dbae05d45c6ac1f2abcc389f920274e768a60 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 29 Oct 2013 20:14:35 +0800 Subject: [PATCH] IDEMPIERE-1453 Remove warning C_Tax_ID=0 for invoice description lines. Fixed regression "nll value in column "c_tax_id" violates not-null constraint" --- org.adempiere.base/src/org/compiere/model/MInvoiceTax.java | 5 +++-- org.adempiere.base/src/org/compiere/model/MOrderTax.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java b/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java index 131eb4c05b..e888b88f45 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java @@ -68,9 +68,10 @@ public class MInvoiceTax extends X_C_InvoiceTax return null; C_Tax_ID = ((Integer)old).intValue(); } - if (!line.isDescription() && C_Tax_ID == 0) + if (C_Tax_ID == 0) { - s_log.warning("C_Tax_ID=0"); + if (!line.isDescription()) + s_log.warning("C_Tax_ID=0"); return null; } diff --git a/org.adempiere.base/src/org/compiere/model/MOrderTax.java b/org.adempiere.base/src/org/compiere/model/MOrderTax.java index 5c71d4c6ff..917a9c4120 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrderTax.java +++ b/org.adempiere.base/src/org/compiere/model/MOrderTax.java @@ -69,9 +69,10 @@ public class MOrderTax extends X_C_OrderTax } C_Tax_ID = ((Integer)old).intValue(); } - if (!line.isDescription() && C_Tax_ID == 0) + if (C_Tax_ID == 0) { - s_log.fine("No Tax"); + if (!line.isDescription()) + s_log.fine("No Tax"); return null; }