diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/ControlGestion.Reporting.rptproj b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/ControlGestion.Reporting.rptproj
index 1e2389fa6..0c514a19f 100644
--- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/ControlGestion.Reporting.rptproj
+++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/ControlGestion.Reporting.rptproj
@@ -53,11 +53,11 @@
+
-
diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/REstRec.rdl b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/REstRec.rdl
index c79faa442..0f25a860f 100644
--- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/REstRec.rdl
+++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/REstRec.rdl
@@ -3,9 +3,19 @@
Segoe UI
0
-
+
dsREstRec
+
+
+ =Parameters!p_f_inicio.Value
+ true
+
+
+ =Parameters!p_f_final.Value
+ true
+
+
@@ -639,7 +649,7 @@
- DataSet1
+ dsREstRec
0.06944in
0.89818in
0.75in
@@ -873,10 +883,42 @@
+
+
+ String
+
+
+ 01/01/2020
+
+
+ Fecha Inicio
+
+
+ String
+
+
+ 01/02/2020
+
+
+ Fecha Final
+
+
4
2
+
+
+ 0
+ 0
+ p_f_inicio
+
+
+ 1
+ 0
+ p_f_final
+
+
diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion.rdl b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion.rdl
index b05fb23bc..c93d9f478 100644
--- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion.rdl
+++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacion.rdl
@@ -7,10 +7,18 @@
dsRecaudacion
+
+ =Parameters!p_fechainicial.Value
+ true
+
=Parameters!p_recaudador.Value
true
+
+ =Parameters!p_fechafinal.Value
+ true
+
@@ -835,6 +843,15 @@
+
+ String
+
+
+ '01/01/2020'
+
+
+ Fecha Inicial
+
String
@@ -844,6 +861,15 @@
Recaudador
+
+ String
+
+
+ 01/01/2022
+
+
+ Fecha Final
+
@@ -851,10 +877,20 @@
2
- 0
+ 1
0
p_recaudador
+
+ 0
+ 0
+ p_fechainicial
+
+
+ 2
+ 0
+ p_fechafinal
+
diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacionD.rdl b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacionD.rdl
index 8460cbdcc..98e6f6f98 100644
--- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacionD.rdl
+++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacionD.rdl
@@ -2,32 +2,71 @@
Segoe UI
0
+
+
+
+ dsRecaudacionD
+
+
+ =Parameters!p_recaudador.Value
+ true
+
+
+
+
+
+ COD_RECAUDADOR
+ System.String
+
+
+ FECHA_CONTABLE
+ System.DateTime
+
+
+ REMESA
+ System.String
+
+
+ MONTO
+ System.Double
+
+
+ COMISION
+ System.Double
+
+
+ MONTO_RETENCION
+ System.Double
+
+
+
+
-
+
- 2.89687cm
+ 2.5cm
- 2.75229cm
+ 2.5cm
- 3.58542cm
+ 3.23708cm
- 3.71646cm
+ 3.26729cm
- 2.80333cm
+ 5.56917cm
- 0.56296cm
+ 0.6cm
@@ -41,89 +80,14 @@
Recaudador
-
+
- Textbox1
-
-
- DarkBlue
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Remesa
-
-
-
-
-
-
- Textbox3
-
-
- DarkBlue
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Monto Recibidos
-
-
-
-
-
-
- Textbox11
+ Textbox2
-
-
- ó
-
-
-
- n
+ Remesa
-
+
- Textbox5
+ Textbox8
+
+
+
+
+ Textbox6
+
+
+ DarkBlue
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
- ó
-
-
-
- n 2%
+ Monto Comision
-
+
- Textbox9
+ Textbox12
+
+
+ DarkBlue
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Retencion 2%
+
+
+
+
+
+
+ Textbox10
+
@@ -284,7 +278,7 @@
-
+
true
true
@@ -293,8 +287,7 @@
=Fields!REMESA.Value
@@ -317,7 +310,7 @@
-
+
true
true
@@ -325,9 +318,7 @@
=Fields!MONTO.Value
-
+
@@ -349,7 +340,7 @@
-
+
true
true
@@ -357,7 +348,9 @@
=Fields!COMISION.Value
-
+
@@ -379,7 +372,7 @@
-
+
true
true
@@ -428,30 +421,31 @@
After
-
+
- dsRecaudacion
- 0.7553cm
- 0.45717cm
- 1.16296cm
- 15.75437cm
+ dsRecaudacionD
+ 1.05516cm
+ 0.79057cm
+ 1.2cm
+ 17.07354cm
-
+
true
true
- Total del Mes:
+ Mes Contable: ENERO
@@ -459,11 +453,11 @@
- Textbox18
- 2.42218cm
- 0.13967cm
+ Textbox14
+ 0.15558cm
+ 0.65828cm
0.6cm
- 2.5cm
+ 4.61667cm
1
-
+
+ true
+ true
+
+
+
+
+ Total del mes:
+
+
+
+
+
+
+ Textbox3
+ 3.03953cm
+ 0.65828cm
+ 0.6cm
+ 2.63229cm
+ 2
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
true
true
@@ -491,12 +517,12 @@
- Textbox18
- 2.42218cm
- 7.04467cm
+ Textbox4
+ 2.90724cm
+ 7.37807cm
0.6cm
- 3.24021cm
- 2
+ 2.5cm
+ 3
@@ -507,7 +533,7 @@
2pt
-
+
true
true
@@ -523,12 +549,12 @@
- Textbox18
- 2.42218cm
- 11.05279cm
+ Textbox4
+ 2.90724cm
+ 10.01918cm
0.6cm
- 2.65875cm
- 3
+ 2.5cm
+ 4
@@ -539,7 +565,7 @@
2pt
-
+
true
true
@@ -555,52 +581,11 @@
- Textbox18
- 2.42218cm
- 13.55279cm
+ Textbox4
+ 2.90724cm
+ 15.4261cm
0.6cm
- 2.65875cm
- 4
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
- true
- true
-
-
-
-
- Fecha Contable:
-
-
-
- =First(Fields!FECHA_CONTABLE.Value, "dsRecaudacion")
-
-
-
-
-
-
- Textbox17
- 0.07056cm
- 0.35876cm
- 0.6cm
- 7.95042cm
+ 2.5cm
5
- 1.59167in
+ 1.60997in
@@ -787,10 +772,28 @@
+
+
+ String
+
+
+ LAFIS
+
+
+ Recaudador
+
+
4
2
+
+
+ 0
+ 0
+ p_recaudador
+
+
diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsREstRec.rsd b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsREstRec.rsd
index 686b89d37..395266854 100644
--- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsREstRec.rsd
+++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsREstRec.rsd
@@ -2,15 +2,30 @@
- dsAyA
+ dsOracle
+
+
+ false
+ false
+ false
+ true
+
+
+ false
+ false
+ false
+ true
+
+
select
a.cod_recaudador,
1 recibos,
round(to_number(a.total_pagado) / 100,2) monto,
round(to_number(a.comision) / 100,2) comision
-from mtx_archivos_recaudadores a
+from MTX.mtx_archivos_recaudadores a
where
- to_date(substr(a.fecha_contable,1,8),'ddmmyyyy') between :p_f_inicio and :p_f_final
+ to_date(substr(a.fecha_contable,1,8),'ddmmyyyy') between :p_f_inicio and :p_f_final
+
diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd
index 98669fc39..101270097 100644
--- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd
+++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd
@@ -10,13 +10,25 @@
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_archivos_recaudadores a, ptx_remesas_dep b
-where fecha_control between '01/01/2000' and '01/01/2022'
+ from mtx.mtx_archivos_recaudadores a, ptx_remesas_dep b
+where fecha_control between :p_fechainicial and :p_fechafinal
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(+)
@@ -45,7 +57,7 @@ group by a.cod_recaudador, a.fecha_control, a.remesa, b.numero_deposito, b.mont
MONTO_RETENCION
- System.Decimal
+ System.Double
diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacionD.rsd b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacionD.rsd
similarity index 79%
rename from ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacionD.rsd
rename to ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacionD.rsd
index 9976b601f..6e16c9069 100644
--- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/RRecaudacionD.rsd
+++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacionD.rsd
@@ -2,13 +2,21 @@
- dsAyA
+ dsOracle
+
+
+ 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, MTX.ptx_remesas_dep b
-where fecha_control between '01/01/2020' and '01/01/2022'
+where fecha_control between '01/01/2020' and '01/02/2020'
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(+)