diff --git a/src/org/openbravo/erpCommon/utility/CashVATUtil.java b/src/org/openbravo/erpCommon/utility/CashVATUtil.java
--- a/src/org/openbravo/erpCommon/utility/CashVATUtil.java
+++ b/src/org/openbravo/erpCommon/utility/CashVATUtil.java
@@ -396,10 +396,8 @@
       final StringBuffer hql = new StringBuffer();
       hql.append(" select coalesce(sum(" + InvoiceTaxCashVAT_V.PROPERTY_PERCENTAGE + "), 0) ");
       hql.append(" from " + InvoiceTaxCashVAT_V.ENTITY_NAME);
-      hql.append(" where " + InvoiceTaxCashVAT_V.PROPERTY_INVOICETAX + "."
-          + InvoiceTax.PROPERTY_TAX + "." + TaxRate.PROPERTY_ID + " = :taxId ");
-      hql.append(" and " + InvoiceTaxCashVAT_V.PROPERTY_INVOICETAX + "."
-          + InvoiceTax.PROPERTY_INVOICE + "." + Invoice.PROPERTY_ID + " = :invoiceId ");
+      hql.append(" where " + InvoiceTaxCashVAT_V.PROPERTY_TAX + " = :taxId ");
+      hql.append(" and " + InvoiceTaxCashVAT_V.PROPERTY_INVOICE + " = :invoiceId ");
       hql.append(" and " + InvoiceTaxCashVAT_V.PROPERTY_CANCELED + " = false ");
       hql.append(" and " + InvoiceTaxCashVAT_V.PROPERTY_PAYMENTDETAILS + "."
           + FIN_PaymentDetail.PROPERTY_ISPREPAYMENT + " = true ");
diff --git a/src-db/database/model/tables/C_INVOICETAX_CASHVAT.xml b/src-db/database/model/tables/C_INVOICETAX_CASHVAT.xml
--- a/src-db/database/model/tables/C_INVOICETAX_CASHVAT.xml
+++ b/src-db/database/model/tables/C_INVOICETAX_CASHVAT.xml
@@ -69,6 +69,9 @@
       <foreign-key foreignTable="FIN_PAYMENT_DETAIL" name="C_INVOICETAXCASHVAT_FPD" onDelete="cascade">
         <reference local="FIN_PAYMENT_DETAIL_ID" foreign="FIN_PAYMENT_DETAIL_ID"/>
       </foreign-key>
+      <index name="C_INVOICETAX_CASHVAT_C_INVOICETAX_ID_IDX" unique="false">
+        <index-column name="C_INVOICETAX_ID"/>
+      </index>
       <index name="C_INVOICETAX_CASHVAT_INVTAX" unique="false">
         <index-column name="C_INVOICETAX_ID"/>
       </index>
diff --git a/src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml b/src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml
--- a/src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml
+++ b/src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW C_INVOICETAX_CASHVAT_V">
-    <view name="C_INVOICETAX_CASHVAT_V"><![CDATA[SELECT itcv.c_invoicetax_cashvat_id AS c_invoicetax_cashvat_v_id, itcv.ad_client_id, itcv.ad_org_id, itcv.created, itcv.createdby, itcv.updated, itcv.updatedby, itcv.isactive, fp.paymentdate, itcv.percentage, itcv.taxamt, itcv.taxbaseamt, fpsd.iscanceled, fp.fin_payment_id, fpd.fin_payment_detail_id, fp.isreceipt, fp.c_bpartner_id, fp.fin_paymentmethod_id, fp.status, fp.amount, fp.c_currency_id, itcv.c_invoicetax_id, itcv.ismanualsettlement FROM c_invoicetax_cashvat itcv JOIN c_invoicetax it ON it.c_invoicetax_id = itcv.c_invoicetax_id JOIN fin_payment_detail fpd ON fpd.fin_payment_detail_id = itcv.fin_payment_detail_id JOIN fin_payment fp ON fp.fin_payment_id = fpd.fin_payment_id JOIN fin_payment_scheduledetail fpsd ON fpd.fin_payment_detail_id = fpsd.fin_payment_detail_id JOIN fin_payment_schedule fpsi ON fpsi.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice WHERE itcv.ismanualsettlement = 'N' AND fpsi.c_invoice_id = it.c_invoice_id UNION ALL SELECT itcv.c_invoicetax_cashvat_id AS c_invoicetax_cashvat_v_id, itcv.ad_client_id, itcv.ad_org_id, itcv.created, itcv.createdby, itcv.updated, itcv.updatedby, itcv.isactive, NULL AS paymentdate, itcv.percentage, itcv.taxamt, itcv.taxbaseamt, 'N' AS iscanceled, NULL AS fin_payment_id, NULL AS fin_payment_detail_id, NULL AS isreceipt, NULL AS c_bpartner_id, NULL AS fin_paymentmethod_id, NULL AS status, NULL AS amount, NULL AS c_currency_id, itcv.c_invoicetax_id, itcv.ismanualsettlement FROM c_invoicetax_cashvat itcv WHERE itcv.ismanualsettlement = 'Y']]></view>
+    <view name="C_INVOICETAX_CASHVAT_V"><![CDATA[SELECT itcv.c_invoicetax_cashvat_id AS c_invoicetax_cashvat_v_id, itcv.ad_client_id, itcv.ad_org_id, itcv.created, itcv.createdby, itcv.updated, itcv.updatedby, itcv.isactive, fp.paymentdate, itcv.percentage, itcv.taxamt, itcv.taxbaseamt, fpsd.iscanceled, fp.fin_payment_id, fpd.fin_payment_detail_id, fp.isreceipt, fp.c_bpartner_id, fp.fin_paymentmethod_id, fp.status, fp.amount, fp.c_currency_id, itcv.c_invoicetax_id, itcv.ismanualsettlement, it.c_invoice_id, it.c_tax_id FROM c_invoicetax_cashvat itcv JOIN c_invoicetax it ON it.c_invoicetax_id = itcv.c_invoicetax_id JOIN fin_payment_detail fpd ON fpd.fin_payment_detail_id = itcv.fin_payment_detail_id JOIN fin_payment fp ON fp.fin_payment_id = fpd.fin_payment_id JOIN fin_payment_scheduledetail fpsd ON fpd.fin_payment_detail_id = fpsd.fin_payment_detail_id JOIN fin_payment_schedule fpsi ON fpsi.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice WHERE itcv.ismanualsettlement = 'N' AND fpsi.c_invoice_id = it.c_invoice_id UNION ALL SELECT itcv.c_invoicetax_cashvat_id AS c_invoicetax_cashvat_v_id, itcv.ad_client_id, itcv.ad_org_id, itcv.created, itcv.createdby, itcv.updated, itcv.updatedby, itcv.isactive, NULL AS paymentdate, itcv.percentage, itcv.taxamt, itcv.taxbaseamt, 'N' AS iscanceled, NULL AS fin_payment_id, NULL AS fin_payment_detail_id, NULL AS isreceipt, NULL AS c_bpartner_id, NULL AS fin_paymentmethod_id, NULL AS status, NULL AS amount, NULL AS c_currency_id, itcv.c_invoicetax_id, itcv.ismanualsettlement, it.c_invoice_id, it.c_tax_id FROM c_invoicetax_cashvat itcv, c_invoicetax it WHERE itcv.ismanualsettlement = 'Y' AND itcv.c_invoicetax_id = it.c_invoicetax_id]]></view>
   </database>
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -325550,6 +325550,40 @@
 <!--A269590856C443468BEA02704D3AB1DA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--A269590856C443468BEA02704D3AB1DA--></AD_COLUMN>
 
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87--><AD_COLUMN>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <AD_COLUMN_ID><![CDATA[A2921A7F2FC346EB8F11CE54AC4CAC87]]></AD_COLUMN_ID>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <NAME><![CDATA[C_Tax_ID]]></NAME>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <COLUMNNAME><![CDATA[C_Tax_ID]]></COLUMNNAME>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <AD_TABLE_ID><![CDATA[468BC822115146B8B67E82F671F570B3]]></AD_TABLE_ID>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <SEQNO><![CDATA[260]]></SEQNO>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <POSITION><![CDATA[25]]></POSITION>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A2921A7F2FC346EB8F11CE54AC4CAC87--></AD_COLUMN>
+
 <!--A299657C67C841EBB8E51AFB606EE4EF--><AD_COLUMN>
 <!--A299657C67C841EBB8E51AFB606EE4EF-->  <AD_COLUMN_ID><![CDATA[A299657C67C841EBB8E51AFB606EE4EF]]></AD_COLUMN_ID>
 <!--A299657C67C841EBB8E51AFB606EE4EF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -337388,6 +337422,40 @@
 <!--B99B30BC8FDB4137AA3DBAB7D2CF0F2B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--B99B30BC8FDB4137AA3DBAB7D2CF0F2B--></AD_COLUMN>
 
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7--><AD_COLUMN>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <AD_COLUMN_ID><![CDATA[B9CF022F66984C6CA7C6CED8B01EF1E7]]></AD_COLUMN_ID>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <NAME><![CDATA[C_Invoice_ID]]></NAME>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <COLUMNNAME><![CDATA[C_Invoice_ID]]></COLUMNNAME>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <AD_TABLE_ID><![CDATA[468BC822115146B8B67E82F671F570B3]]></AD_TABLE_ID>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <SEQNO><![CDATA[250]]></SEQNO>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <POSITION><![CDATA[24]]></POSITION>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B9CF022F66984C6CA7C6CED8B01EF1E7--></AD_COLUMN>
+
 <!--B9CF105C680D4E568EC68F05F8522446--><AD_COLUMN>
 <!--B9CF105C680D4E568EC68F05F8522446-->  <AD_COLUMN_ID><![CDATA[B9CF105C680D4E568EC68F05F8522446]]></AD_COLUMN_ID>
 <!--B9CF105C680D4E568EC68F05F8522446-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -360309,6 +360377,7 @@
 <!--E9C75CC455C44F1A9D39878102D1DDE5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--E9C75CC455C44F1A9D39878102D1DDE5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--E9C75CC455C44F1A9D39878102D1DDE5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->  <POSITION><![CDATA[23]]></POSITION>
 <!--E9C75CC455C44F1A9D39878102D1DDE5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--E9C75CC455C44F1A9D39878102D1DDE5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--E9C75CC455C44F1A9D39878102D1DDE5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>