0021068: Reactivating an invoice that has discounts and price includes taxes, the tax amt sometimes is not correct

diff --git a/src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml b/src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml
--- a/src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml
+++ b/src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml
@@ -25,6 +25,7 @@
 
 v_Count NUMBER;
 v_LineNo  NUMBER;
+v_test NUMBER;
 v_C_Invoice_ID C_INVOICELINETAX.C_INVOICE_ID%TYPE;
 v_C_Tax_ID C_INVOICELINETAX.C_TAX_ID%TYPE;
 v_c_invoicetax_id C_INVOICETAX.C_INVOICETAX_ID%TYPE;
@@ -33,6 +34,9 @@
 v_Rate  C_TAX.RATE%TYPE;
 v_Increment_Amount C_ORDERTAX.TAXAMT%TYPE ;
 v_Increment_Base C_ORDERTAX.TAXBASEAMT%TYPE ;
+v_totallines NUMERIC:=0;
+v_grandtotal NUMERIC:=0;
+v_istaxincluded CHAR(1);
     
 BEGIN
     
@@ -47,10 +51,11 @@
       v_C_Invoice_ID:=:OLD.C_INVOICE_ID;
     END IF;
 
-    SELECT C_CURRENCY.STDPRECISION
-    INTO v_Prec
-    FROM C_INVOICE, C_CURRENCY
+    SELECT C_CURRENCY.STDPRECISION, M_PRICELIST.istaxincluded
+    INTO v_Prec, v_istaxincluded
+    FROM C_INVOICE, C_CURRENCY, M_PRICELIST
     WHERE C_INVOICE.C_CURRENCY_ID = C_CURRENCY.C_CURRENCY_ID
+    AND C_INVOICE.M_PRICELIST_ID = M_PRICELIST.M_PRICELIST_ID
     AND C_INVOICE_ID = v_C_Invoice_ID;
     
     SELECT DOCTAXAMOUNT, RATE
@@ -95,6 +100,11 @@
     END IF;
   ELSE
     
+    SELECT TAXBASEAMT INTO v_test FROM c_invoicetax
+    WHERE C_INVOICE_ID = :OLD.C_Invoice_ID
+    AND C_TAX_ID = :OLD.C_TAX_ID
+    AND Recalculate = 'Y';
+    
     UPDATE C_INVOICETAX SET TAXAMT = (CASE WHEN v_DocTaxAmount='D' THEN ROUND((TAXBASEAMT - :OLD.TAXBASEAMT) * v_Rate/100, v_Prec) ELSE (TAXAMT - :OLD.TAXAMT) END), TAXBASEAMT=TAXBASEAMT - :OLD.TAXBASEAMT
     WHERE C_INVOICE_ID = :OLD.C_Invoice_ID
     AND C_TAX_ID = :OLD.C_TAX_ID
@@ -104,6 +114,14 @@
     WHERE C_INVOICE_ID = :OLD.C_Invoice_ID
     AND C_TAX_ID = :OLD.C_TAX_ID
     AND TAXAMT=0 AND TAXBASEAMT=0;
+    
+    IF (v_istaxincluded = 'Y') THEN
+      SELECT totallines, grandtotal INTO v_totallines, v_grandtotal
+      FROM C_invoice
+      WHERE c_invoice_id = v_C_Invoice_ID;
+      C_INVOICETAX_ROUNDING(v_C_Invoice_ID, v_grandtotal, v_totallines);
+    END IF;
+    
   END IF;
 END C_INVOICELINETAX_TRG
 ]]></body>