--- /home/jnavarro/Descargas/Mincon/ReportInvoiceVendorDimensionalAnalysesJR_data_OLD.xsql
+++ /home/jnavarro/Descargas/Mincon/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql
@@ -129,7 +129,12 @@
       FROM (SELECT NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, 
       SUM(LINENETAMT) AS AMOUNT, SUM(CASE WHEN DOCBASETYPE = 'APC' THEN QTYINVOICED*-1 ELSE QTYINVOICED END) AS QTY,
       SUM(LINENETREF) AS AMOUNTREF, SUM(QTYINVOICEDREF) AS QTYREF,     
-	  CASE WHEN (SELECT COUNT(C_CONVERSION_RATE_DOCUMENT_ID) FROM C_CONVERSION_RATE_DOCUMENT WHERE C_INVOICE_ID=INVOICEID) > 0 THEN ((SELECT RATE FROM C_CONVERSION_RATE_DOCUMENT WHERE C_INVOICE_ID=INVOICEID)*SUM(LINENETAMT)) ELSE C_CURRENCY_CONVERT(SUM(CASE WHEN DOCBASETYPE = 'APC' THEN LINENETAMT*-1 ELSE LINENETAMT END), TRCURRENCYID, ?, TO_DATE(TRDATE), NULL, TRCLIENTID, TRORGID) END AS CONVAMOUNT,
+        case when convrate is null then C_CURRENCY_CONVERT(SUM(CASE
+                                              WHEN DOCBASETYPE = 'APC' THEN LINENETAMT*-1
+                                              ELSE LINENETAMT
+                                          END), TRCURRENCYID, ?, TO_DATE(TRDATE), NULL, TRCLIENTID, TRORGID)
+        else round(SUM(LINENETAMT) * convrate, C_GET_CURRENCY_PRECISION(?, 'A'))
+        end AS CONVAMOUNT,
 	  0 AS CONVAMOUNTREF,
       TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID
       FROM (SELECT to_char('1') AS NIVEL1, to_char('2') AS NIVEL2, to_char('3') AS NIVEL3, to_char('4') AS NIVEL4, to_char('5') AS NIVEL5, 
@@ -140,12 +145,16 @@
 	  C_INVOICELINE.AD_CLIENT_ID AS TRCLIENTID,      
 	  C_INVOICELINE.AD_ORG_ID AS TRORGID,
       C_INVOICE.C_INVOICE_ID AS INVOICEID,
-      C_DOCTYPE.DOCBASETYPE AS DOCBASETYPE
+      C_DOCTYPE.DOCBASETYPE AS DOCBASETYPE,
+      conversionrate.rate as convrate
       FROM C_INVOICELINE left join M_PRODUCT on C_INVOICELINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
                          left join C_UOM     on C_INVOICELINE.C_UOM_ID = C_UOM.C_UOM_ID 
                          left join M_PRODUCT_CATEGORY on M_PRODUCT.M_PRODUCT_CATEGORY_ID = M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
                          left join C_INVOICE on C_INVOICE.C_INVOICE_ID = C_INVOICELINE.C_INVOICE_ID
-                         left join C_DOCTYPE on C_INVOICE.C_DOCTYPE_ID=C_DOCTYPE.C_DOCTYPE_ID,
+                         left join C_DOCTYPE on C_INVOICE.C_DOCTYPE_ID=C_DOCTYPE.C_DOCTYPE_ID
+                          left join C_Conversion_Rate_Document conversionrate on conversionrate.c_invoice_id = C_INVOICE.C_INVOICE_ID
+                            and conversionrate.c_currency_id_to = ?
+                            and conversionrate.c_currency_id = C_INVOICE.C_CURRENCY_ID,
       C_BPARTNER, C_BP_GROUP
       WHERE C_INVOICE.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
       AND C_BPARTNER.C_BP_GROUP_ID = C_BP_GROUP.C_BP_GROUP_ID
@@ -155,9 +164,11 @@
       AND 0=0 AND C_INVOICE.AD_ORG_ID IN ('1')
       AND C_INVOICE.AD_CLIENT_ID IN ('6')
       AND 1=1) AA
-      GROUP BY NIVEL1,  NIVEL2, NIVEL3, NIVEL4, NIVEL5, TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID, INVOICEID) ZZ
+      GROUP BY NIVEL1,  NIVEL2, NIVEL3, NIVEL4, NIVEL5, TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID, INVOICEID, convrate) ZZ
       GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, 1
      ]]></Sql>
+    <Parameter name="cCurrencyConv"/>
+    <Parameter name="cCurrencyConv"/>
     <Parameter name="cCurrencyConv"/>
 	<Parameter name="cCurrencyConv"/>
 	<Parameter name="cCurrencyConv"/>