AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
rrene
2020-06-03 12:33:14 -07:00
parent 9deddb32b8 561fab5f3e
commit 4bcd89cffa
5 changed files with 170 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Bancos/CargarConciliacionesBancarias.aspx.vb
View File

@@ -77,7 +77,7 @@ Partial Class Bancos_CargarConciliacionesBancarias
Protected Sub BtnCargaExcel_Click(sender As Object, e As EventArgs)
If TxtExcel.getfiles().Archivos.Count > 0 Then
Dim file As Archivo = TxtExcel.getfiles().Archivos(0)
Dim Directorio As String = ModExtensiones.DirectorioBaseEmpresas & file.patch
Dim Directorio As String = AppDomain.CurrentDomain.BaseDirectory & file.patch
Dim Tipo As String = If(file.Extencion.Contiene("xlsx", "xlsx", "xlsm", "xlsb"), "EXCEL", "CSV")
CargaExcel(Directorio, file.filename, Tipo)
Else

3
Bancos/ConciliacionesBancarias.aspx.vb
View File

@@ -644,9 +644,12 @@ Partial Class Bancos_ConciliacionesBancariasaspx
ObjConta.Dispose()
End If
Dim Filtros As String = String.Format("<b>Cuenta: </b>{0}&emsp;<b>Conciliado: </b>{1}&emsp;<b>Fecha Inicial: </b>{2}&emsp;<b>Fecha Final: </b>{3}", DdlCuenta.SelectedItem.Text, DdlConciliado.SelectedItem.Text, txtFechaI.Text, txtFechaF.Text)
params.Add(New ReportParameter("SaldoFinalContabilidad", (SaldoFinalContabilidad.FormatoNumero)))
params.Add(New ReportParameter("SaldoFinalContabilidadComplementaria", (SaldoFinalContabilidadComplementaria.FormatoNumero)))
params.Add(New ReportParameter("Diferencia", (SaldoFinalLibros - SaldoFinalContabilidad).FormatoNumero))
params.Add(New ReportParameter("Filtros", Filtros))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))