0023907: Nondeductible taxes are posted ignoring the accounting dimensions of the invoice lines (and breakdown)

diff --git a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
@@ -1219,6 +1219,7 @@
       BigDecimal cumulativeTaxLineAmount, BigDecimal taxAmount, DocInvoiceData[] data,
       ConnectionProvider conn, Fact fact, DocLine docLine, String Fact_Acct_Group_ID) {
     for (int j = 0; j < data.length; j++) {
+      docLine.loadAttributes(data[j], this);
       invoiceLineTaxCount++;
       // We have to adjust the amount in last line of tax
       if (invoiceLineTaxCount == totalInvoiceLineTax) {
diff --git a/src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql b/src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql
@@ -104,8 +104,12 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
       <![CDATA[
-        SELECT a.P_Revenue_Acct, a.P_Expense_Acct, t.TaxAmt
-        FROM M_Product_Acct a, C_InvoiceLineTax t, C_InvoiceLine l, M_Product p
+        SELECT a.P_Revenue_Acct, a.P_Expense_Acct, t.TaxAmt,
+               COALESCE(C_INVOICELINE_ACCTDIMENSION.C_PROJECT_ID, l.C_PROJECT_ID) AS C_PROJECT_ID,
+               COALESCE(C_INVOICELINE_ACCTDIMENSION.USER1_ID,l.USER1_ID) AS USER1_ID,
+               COALESCE(C_INVOICELINE_ACCTDIMENSION.C_COSTCENTER_ID,l.C_COSTCENTER_ID) AS C_COSTCENTER_ID
+        FROM M_Product_Acct a, C_InvoiceLineTax t, M_Product p, C_InvoiceLine l 
+             left join C_INVOICELINE_ACCTDIMENSION on l.C_INVOICELINE_ID = C_INVOICELINE_ACCTDIMENSION.C_INVOICELINE_ID
         WHERE t.C_InvoiceLine_Id = l.C_InvoiceLine_Id
         AND l.M_Product_Id = p.M_Product_Id
         AND p.M_Product_Id = a.M_Product_Id
@@ -144,8 +148,12 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
       <![CDATA[
-    SELECT a.GLITEM_CREDIT_ACCT AS P_REVENUE_ACCT, a.GLITEM_DEBIT_ACCT AS P_EXPENSE_ACCT, t.TaxAmt
+    SELECT a.GLITEM_CREDIT_ACCT AS P_REVENUE_ACCT, a.GLITEM_DEBIT_ACCT AS P_EXPENSE_ACCT, t.TaxAmt,
+           COALESCE(C_INVOICELINE_ACCTDIMENSION.C_PROJECT_ID, l.C_PROJECT_ID) AS C_PROJECT_ID,
+           COALESCE(C_INVOICELINE_ACCTDIMENSION.USER1_ID,l.USER1_ID) AS USER1_ID,
+           COALESCE(C_INVOICELINE_ACCTDIMENSION.C_COSTCENTER_ID,l.C_COSTCENTER_ID) AS C_COSTCENTER_ID
     FROM C_GLITEM_ACCT a, C_InvoiceLineTax t, C_InvoiceLine l
+         left join C_INVOICELINE_ACCTDIMENSION on l.C_INVOICELINE_ID = C_INVOICELINE_ACCTDIMENSION.C_INVOICELINE_ID
     WHERE t.C_InvoiceLine_Id = l.C_InvoiceLine_Id 
     AND l.Account_ID = a.C_GLITEM_id
     AND a.C_ACCTSCHEMA_id = ?