diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion.rdl b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion.rdl index c93d9f478..fb26ea8d5 100644 --- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion.rdl +++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion.rdl @@ -7,18 +7,10 @@ dsRecaudacion - - =Parameters!p_fechainicial.Value - true - =Parameters!p_recaudador.Value true - - =Parameters!p_fechafinal.Value - true - @@ -44,7 +36,7 @@ MONTO_RETENCION - System.Decimal + System.Double @@ -843,32 +835,9 @@ - - String - - - '01/01/2020' - - - Fecha Inicial - String - - - AUTO - - - Recaudador - - - String - - - 01/01/2022 - - - Fecha Final + Recaudador: @@ -876,20 +845,10 @@ 4 2 - - 1 - 0 - p_recaudador - 0 0 - p_fechainicial - - - 2 - 0 - p_fechafinal + p_recaudador diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion3001.rdl b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion3001.rdl index 76ff10ad2..d3df5a91c 100644 --- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion3001.rdl +++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion3001.rdl @@ -982,20 +982,10 @@ String - - - 01/01/2000 - - Fecha Inicio String - - - 01/01/2022 - - Fecha Final diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacionD.rdl b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacionD.rdl index 98e6f6f98..65e8650c9 100644 --- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacionD.rdl +++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacionD.rdl @@ -775,11 +775,6 @@ String - - - LAFIS - - Recaudador diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRevComis.rdl b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRevComis.rdl index fb384bb71..af090771f 100644 --- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRevComis.rdl +++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRevComis.rdl @@ -6,6 +6,12 @@ dsRevComis + + + =Parameters!p_remesa.Value + true + + @@ -1100,10 +1106,23 @@ + + + String + Numero Remesa + + 4 2 + + + 0 + 0 + p_remesa + + Cm diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RSumComisionesFPago.rdl b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RSumComisionesFPago.rdl index dae716d8e..41edff3c1 100644 --- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RSumComisionesFPago.rdl +++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RSumComisionesFPago.rdl @@ -1278,11 +1278,6 @@ String - - - LAFIS - - Recaudador diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsConciliacion_Interactiva.rsd b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsConciliacion_Interactiva.rsd index 97b39d796..2ba26875a 100644 --- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsConciliacion_Interactiva.rsd +++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsConciliacion_Interactiva.rsd @@ -16,7 +16,7 @@ SUBSTR(a.nir_aya,1,7)||SUBSTR(a.nir_aya,8,2) recibo, (a.monto_aya + a.monto_aut) monto_b, TO_NUMBER(a.fila_rec) autoriz_rec FROM PTX_CONCILIA a, - MTX_RECAUDADORES m + MTX.MTX_RECAUDADORES m WHERE a.remesa_rec = 'TODOS' AND a.cod_rec = 'TODOS' AND a.estado <> 'OK' diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRSumComisionesFPago.rsd b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRSumComisionesFPago.rsd index e9d7e551a..277e74610 100644 --- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRSumComisionesFPago.rsd +++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRSumComisionesFPago.rsd @@ -42,7 +42,7 @@ ELSE 0 -- NO END com_menor -from mtx_archivos_recaudadores a +from mtx.mtx_archivos_recaudadores a left join mtx_parametros_recaudador p on a.cod_recaudador=p.cod_recaudador and p.parametro = 'Corte_Comision' @@ -60,7 +60,7 @@ where a.cod_recaudador = p.cod_recaudador -- and s.numero_servicio = substr(a.numero_recibo,2,7) -- and s.sec_nis = substr(a.numero_recibo,9,2) - and a.fecha_c_pago between '01/01/2000' and '01/01/2022' + and a.fecha_c_pago between '01/01/2020' and '01/02/2020' and (a.cod_recaudador = diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecRegion.rsd b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecRegion.rsd index 17b7425b3..588a23d2d 100644 --- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecRegion.rsd +++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecRegion.rsd @@ -22,7 +22,7 @@ decode(substr(s.cod_agencia,1,1),'1','1. METROPOLITANA','2','2. CENTRAL','3','3. to_date(substr(a.fecha_contable,1,2) || '/' || substr(a.fecha_contable,3,2) || '/' || substr(a.fecha_contable,5,4),'dd/mm/yyyy') fecha_contable, sum(round(to_number(a.total_pagado) / 100,2)) monto, sum(round(to_number(a.comision) / 100,2)) comision - from mtx_archivos_recaudadores a, ptx_servicios s + from mtx.mtx_archivos_recaudadores a, ptx_servicios s where to_date(substr(a.fecha_contable,1,8),'ddmmyyyy') between diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd index 101270097..21b305570 100644 --- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd +++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd @@ -10,25 +10,13 @@ false true - - false - false - false - true - - - false - false - false - true - select distinct a.cod_recaudador, fecha_control fecha_contable, decode(ltrim(rtrim(b.numero_deposito)), '',a.remesa, b.NUMERO_DEPOSITO) remesa, sum(round(to_number(a.total_pagado) / 100,2)) monto, sum(round(to_number(a.comision) / 100,2)) comision, b.monto_retencion from mtx.mtx_archivos_recaudadores a, ptx_remesas_dep b -where fecha_control between :p_fechainicial and :p_fechafinal +where fecha_control between '01/01/20' and '01/02/20' and a.cod_recaudador = decode(:p_recaudador,'TODOS',a.cod_recaudador,:p_recaudador) and a.remesa = b.numero_remesa (+) AND a.COD_RECAUDADOR = B.COD_RECAUDADOR(+) diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion3001.rsd b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion3001.rsd index 4c1e70098..cbfd79c07 100644 --- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion3001.rsd +++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion3001.rsd @@ -9,12 +9,14 @@ false false true + DateTime false false false true + DateTime select diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRevComis.rsd b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRevComis.rsd index 01c6fbef8..27fd4fefa 100644 --- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRevComis.rsd +++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRevComis.rsd @@ -3,6 +3,14 @@ dsOracle + + + false + false + false + true + + select distinct substr(a.numero_recibo,2,7) numero_servicio, max(to_date(substr(a.numero_recibo,11,8),'ddmmyyyy')) fecha_facturacion, @@ -13,13 +21,13 @@ to_number(a.no_autorizacion) autoriz_rec, c.monto_comision, round(to_Number(a.total_pagado) / 100,2) * 0.02 com_calc -from mtx_archivos_recaudadores a, +from mtx.mtx_archivos_recaudadores a, ptx_recibos r, mtx_recaudadores m, ptx_cancelaciones c where to_number(a.no_autorizacion) = r.fila_cancelacion (+) and rownum <= 5 - and a.remesa = '22020101' + and a.remesa = :p_remesa and a.cod_recaudador = m.cod_recaudador -- and c.fila_cancelacion = r.fila_cancelacion -- and c.fila_cancelacion = to_Number(a.no_autorizacion) @@ -35,8 +43,6 @@ group by c.monto_comision, round(to_Number(a.total_pagado) / 100,2) * 0.02 - -