Skip to content
GitLab
Explore
Sign in
sanaviron-quilmes
lib
Compare revisions
0eddba3f4713aad00067bad420538d3074f7de40 to d35649d5e8e77b05eba71fd6068988d6d512e234
Commits on Source (2)
refs #34704
· d343b973
Valentín Tobares
authored
May 11, 2023
and
Jorge Ferrari
committed
May 11, 2023
d343b973
Merge branch 'feature/34704-refinanciar-deuda-fix2' into 'develop'
· d35649d5
Jorge Ferrari
authored
May 11, 2023
refs #34704 See merge request sanaviron-quilmes/lib!55
d35649d5
Hide whitespace changes
Inline
Side-by-side
src/siu/sq/lib/daos/dao_facturador.php
View file @
d35649d5
...
...
@@ -111,6 +111,12 @@ class dao_facturador extends dao
$select
.
=
"anio,"
;
$join
.
=
" join anios a on a.id=r.id_anio"
;
}
if
(
isset
(
$filtro
[
'anio'
]))
{
$join
.
=
" join anios a on a.id=r.id_anio and a.codigo="
.
$this
->
quote
(
$filtro
[
'anio'
]);
}
if
(
isset
(
$filtro
[
'mes'
]))
{
$join
.
=
" join meses m on m.id=r.id_mes and m.numero_mes="
.
$this
->
quote
(
$filtro
[
'mes'
]);
}
if
(
isset
(
$filtro
[
'id_reloj_facturador_estado'
]))
{
$where
.
=
" AND r.id_reloj_facturador_estado = "
.
$this
->
quote
(
$filtro
[
'id_reloj_facturador_estado'
]);
}
...
...
src/siu/sq/lib/util/fecha.php
View file @
d35649d5
...
...
@@ -207,12 +207,18 @@ class fecha
public
static
function
get_nombre_mes
(
$id_mes
)
{
$meses
=
self
::
get_meses_anio
();
return
fecha
::
get_mes
(
$id_mes
,
'mes'
);
}
public
static
function
get_mes
(
$id_mes
,
$dimencion
)
{
$meses
=
fecha
::
get_meses_anio
();
foreach
(
array_keys
(
$meses
)
as
$id
)
{
if
(
$meses
[
$id
][
'id'
]
==
$id_mes
)
{
return
$meses
[
$id
][
'mes'
];
return
$meses
[
$id
][
$dimencion
];
}
}
return
""
;
}
public
static
function
get_meses_anio
()
...
...
@@ -231,30 +237,65 @@ class fecha
}//while */
//Por ahora lo hacemos asi mas croto.
$meses
[
0
][
'id'
]
=
1
;
$meses
[
0
][
'mes'
]
=
"Enero"
;
$meses
[
1
][
'id'
]
=
2
;
$meses
[
1
][
'mes'
]
=
"Febrero"
;
$meses
[
2
][
'id'
]
=
3
;
$meses
[
2
][
'mes'
]
=
"Marzo"
;
$meses
[
3
][
'id'
]
=
4
;
$meses
[
3
][
'mes'
]
=
"Abril"
;
$meses
[
4
][
'id'
]
=
5
;
$meses
[
4
][
'mes'
]
=
"Mayo"
;
$meses
[
5
][
'id'
]
=
6
;
$meses
[
5
][
'mes'
]
=
"Junio"
;
$meses
[
6
][
'id'
]
=
7
;
$meses
[
6
][
'mes'
]
=
"Julio"
;
$meses
[
7
][
'id'
]
=
8
;
$meses
[
7
][
'mes'
]
=
"Agosto"
;
$meses
[
8
][
'id'
]
=
9
;
$meses
[
8
][
'mes'
]
=
"Septiembre"
;
$meses
[
9
][
'id'
]
=
10
;
$meses
[
9
][
'mes'
]
=
"Octubre"
;
$meses
[
10
][
'id'
]
=
11
;
$meses
[
10
][
'mes'
]
=
"Noviembre"
;
$meses
[
11
][
'id'
]
=
12
;
$meses
[
11
][
'mes'
]
=
"Diciembre"
;
$meses
[
1
][
'id'
]
=
1
;
$meses
[
1
][
'mes'
]
=
"Enero"
;
$meses
[
1
][
'nro'
]
=
"01"
;
$meses
[
1
][
'mes_abreviado'
]
=
"Ene."
;
$meses
[
2
][
'id'
]
=
2
;
$meses
[
2
][
'mes'
]
=
"Febrero"
;
$meses
[
2
][
'nro'
]
=
"02"
;
$meses
[
2
][
'mes_abreviado'
]
=
"Feb."
;
$meses
[
3
][
'id'
]
=
3
;
$meses
[
3
][
'mes'
]
=
"Marzo"
;
$meses
[
3
][
'nro'
]
=
"03"
;
$meses
[
3
][
'mes_abreviado'
]
=
"Mar."
;
$meses
[
4
][
'id'
]
=
4
;
$meses
[
4
][
'mes'
]
=
"Abril"
;
$meses
[
4
][
'nro'
]
=
"04"
;
$meses
[
4
][
'mes_abreviado'
]
=
"Abr."
;
$meses
[
5
][
'id'
]
=
5
;
$meses
[
5
][
'mes'
]
=
"Mayo"
;
$meses
[
5
][
'nro'
]
=
"05"
;
$meses
[
5
][
'mes_abreviado'
]
=
"May."
;
$meses
[
6
][
'id'
]
=
6
;
$meses
[
6
][
'mes'
]
=
"Junio"
;
$meses
[
6
][
'nro'
]
=
"06"
;
$meses
[
6
][
'mes_abreviado'
]
=
"Jun."
;
$meses
[
7
][
'id'
]
=
7
;
$meses
[
7
][
'mes'
]
=
"Julio"
;
$meses
[
7
][
'nro'
]
=
"07"
;
$meses
[
7
][
'mes_abreviado'
]
=
"Jul."
;
$meses
[
8
][
'id'
]
=
8
;
$meses
[
8
][
'mes'
]
=
"Agosto"
;
$meses
[
8
][
'nro'
]
=
"08"
;
$meses
[
8
][
'mes_abreviado'
]
=
"Ago."
;
$meses
[
9
][
'id'
]
=
9
;
$meses
[
9
][
'mes'
]
=
"Septiembre"
;
$meses
[
9
][
'nro'
]
=
"09"
;
$meses
[
9
][
'mes_abreviado'
]
=
"Sep."
;
$meses
[
10
][
'id'
]
=
10
;
$meses
[
10
][
'mes'
]
=
"Octubre"
;
$meses
[
10
][
'nro'
]
=
"10"
;
$meses
[
10
][
'mes_abreviado'
]
=
"Oct."
;
$meses
[
11
][
'id'
]
=
11
;
$meses
[
11
][
'mes'
]
=
"Noviembre"
;
$meses
[
11
][
'nro'
]
=
"11"
;
$meses
[
11
][
'mes_abreviado'
]
=
"Nov."
;
$meses
[
12
][
'id'
]
=
12
;
$meses
[
12
][
'mes'
]
=
"Diciembre"
;
$meses
[
12
][
'nro'
]
=
"12"
;
$meses
[
12
][
'mes_abreviado'
]
=
"Dic."
;
return
$meses
;
}
...
...
@@ -322,50 +363,20 @@ class fecha
return
false
;
}
public
static
function
tal_mes
(
$mes
)
{
if
(
$mes
==
1
)
return
"Ene."
;
if
(
$mes
==
2
)
return
"Feb."
;
if
(
$mes
==
3
)
return
"Mar."
;
if
(
$mes
==
4
)
return
"Abr."
;
if
(
$mes
==
5
)
return
"May."
;
if
(
$mes
==
6
)
return
"Jun."
;
if
(
$mes
==
7
)
return
"Jul."
;
if
(
$mes
==
8
)
return
"Ago."
;
if
(
$mes
==
9
)
return
"Sep."
;
if
(
$mes
==
10
)
return
"Oct."
;
if
(
$mes
==
11
)
return
"Nov."
;
if
(
$mes
==
12
)
return
"Dic."
;
return
""
;
public
static
function
tal_mes
(
$id_mes
)
{
return
fecha
::
get_mes
(
$id_mes
,
'mes_abreviado'
);
}
public
static
function
get_nro_mes
(
$mes
)
{
if
(
$mes
==
"Enero"
)
return
"01"
;
if
(
$mes
==
"Febrero"
)
return
"02"
;
if
(
$mes
==
"Marzo"
)
return
"03"
;
if
(
$mes
==
"Abril"
)
return
"04"
;
if
(
$mes
==
"Mayo"
)
return
"05"
;
if
(
$mes
==
"Junio"
)
return
"06"
;
if
(
$mes
==
"Julio"
)
return
"07"
;
if
(
$mes
==
"Agosto"
)
return
"08"
;
if
(
$mes
==
"Septiembre"
)
return
"09"
;
if
(
$mes
==
"Octubre"
)
return
"10"
;
if
(
$mes
==
"Noviembre"
)
return
"11"
;
if
(
$mes
==
"Diciembre"
)
return
"12"
;
return
"-1"
;
}
}
$meses
=
fecha
::
get_meses_anio
();
foreach
(
array_keys
(
$meses
)
as
$id
)
{
if
(
$meses
[
$id
][
'mes'
]
==
$mes
)
{
return
$meses
[
$id
][
'nro'
];
}
}
return
""
;
}
}
\ No newline at end of file