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

Merge branch 'master' of http://jperez@192.168.10.111:8383/SIG.git

Browse Source
This commit is contained in:
Jonathan Alexis Perez Morales
2020-06-17 08:47:20 -07:00
parent 5d01d5bea3 3f40d9b4da
commit 6cb3dda36b
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Compras/PopUpVerFactura.aspx.vb
View File

@@ -2673,9 +2673,10 @@ Partial Class PopUpVerFactura
Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta))
Dim params As New List(Of ReportParameter)
Dim ArchivoRuta As New System.IO.FileInfo(String.Format("{0}Formatos/Entradas.rdlc", UsuarioActual.Empresa.Ruta))
Dim Archivo As String = $"Empresas/{UsuarioActual.CveEmpresa}/Formatos/EntradaSalidaUniforme.rdlc"
If Not File.Exists($"{Server.MapPath("~")}/{Archivo}") Then
If Not ArchivoRuta.Exists Then
Archivo = "Empresas/Grales/Formatos/EntradaSalidaUniforme.rdlc"
End If

5
Compras/ProveedoresAuxiliar.aspx.vb
View File

@@ -115,6 +115,9 @@ Partial Class Compras_ProveedoresAuxiliar
If txtFechaI.Text = "" Then FechaIn = ""
If txtFechaF.Text = "" Then FechaFn = ""
Dim Proveedor = If(DdlProveeedores.SelectedValue = "-1", "", $"&emsp;<b>Proveedor:</b> {DdlProveeedores.SelectedText}")
Dim OpcionP = If(DdlOpcion.SelectedValue = "-1", "", $"&emsp;<b>Opción:</b> {DdlOpcion.SelectedItem.Text}")
Dim TipoProv = If(DdlTipoProveedor.SelectedValue = "-1", "", $"&emsp;<b>Tipo Proveedor:</b> {DdlTipoProveedor.SelectedItem.Text}")
Dim ContaP = If(DdlOpcionContabilizable.SelectedValue = "-1", "", $"&emsp;<b>Contabilizable:</b> {DdlOpcionContabilizable.SelectedItem.Text}")
If DtDatos IsNot Nothing AndAlso DtDatos.Rows.Count > 0 Then
Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta))
Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
@@ -122,7 +125,7 @@ Partial Class Compras_ProveedoresAuxiliar
params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
params.Add(New ReportParameter("FechaImpresion", Now.ToString))
params.Add(New ReportParameter("Filtros", $"<b>Filtros:</b> {Proveedor}{FechaIn}{FechaFn}"))
params.Add(New ReportParameter("Filtros", $"<b>Filtros:</b> {Proveedor}{FechaIn}{FechaFn}{OpcionP}{TipoProv}{ContaP}"))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
Else

32
Ventas/AuxiliarCliente.aspx.vb
View File

@@ -121,7 +121,7 @@ Partial Class Ventas_AuxiliarCliente
' Next
'End If
worksheet.Rows.InsertEmpty(0, 6)
worksheet.Rows.InsertEmpty(0, 7)
Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", Usuario.Empresa.Ruta))
Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", HttpContext.Current.Request.Url.Scheme, HttpContext.Current.Request.Url.Host, HttpContext.Current.Request.Url.Port, Usuario.CveEmpresa)
@@ -149,12 +149,20 @@ Partial Class Ventas_AuxiliarCliente
RangoTitulo.Style.HorizontalAlignment = GemBox.Spreadsheet.HorizontalAlignmentStyle.Center
RangoTitulo.Style.VerticalAlignment = GemBox.Spreadsheet.VerticalAlignmentStyle.Center
Dim FiltroCliente = worksheet.Cells.GetSubrangeAbsolute(5, celdasConTexto.FirstColumnIndex, 5, celdasConTexto.LastColumnIndex)
FiltroCliente.Merged = True
FiltroCliente.Value = String.Format("Cliente: {0} Fecha Inicio: {1} Fecha Fin: {2} Opción: {3}", DdlClientes.SelectedText, txtFechaI.Text, txtFechaF.Text, DdlOpcion.SelectedItem.Text)
FiltroCliente.Style.Font.Size = 12 * 20
FiltroCliente.Style.Font.Name = "Calibri Light"
FiltroCliente.Style.HorizontalAlignment = GemBox.Spreadsheet.HorizontalAlignmentStyle.Left
FiltroCliente.Style.VerticalAlignment = GemBox.Spreadsheet.VerticalAlignmentStyle.Center
For i = celdasConTexto.FirstColumnIndex To celdasConTexto.LastColumnIndex
worksheet.Rows(6).Cells(i).Style.Font.Size = 12 * 20
worksheet.Rows(6).Cells(i).Style.HorizontalAlignment = GemBox.Spreadsheet.HorizontalAlignmentStyle.Center
worksheet.Rows(6).Cells(i).Style.VerticalAlignment = GemBox.Spreadsheet.VerticalAlignmentStyle.Center
worksheet.Rows(6).Cells(i).Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(75, 119, 190), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
worksheet.Rows(6).Cells(i).Style.Font.Color = GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255)
worksheet.Rows(7).Cells(i).Style.Font.Size = 12 * 20
worksheet.Rows(7).Cells(i).Style.HorizontalAlignment = GemBox.Spreadsheet.HorizontalAlignmentStyle.Center
worksheet.Rows(7).Cells(i).Style.VerticalAlignment = GemBox.Spreadsheet.VerticalAlignmentStyle.Center
worksheet.Rows(7).Cells(i).Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(75, 119, 190), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
worksheet.Rows(7).Cells(i).Style.Font.Color = GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255)
'If i > 0 Then
' Try
' worksheet.Columns(i).AutoFit(1)
@@ -164,13 +172,15 @@ Partial Class Ventas_AuxiliarCliente
Next
Dim IndexEndTable As Integer = Gv.Rows.Count + 8
Dim IndexEndTable As Integer = Gv.Rows.Count + 9
worksheet.Rows(IndexEndTable).Cells(2).Value = "Usuario Imprimió"
worksheet.Rows(IndexEndTable + 1).Cells(2).Value = Usuario.Nombre
worksheet.Rows(IndexEndTable).Cells(0).Value = "Usuario Imprimió:"
worksheet.Rows(IndexEndTable + 1).Cells(0).Value = Usuario.Nombre
worksheet.Rows(IndexEndTable).Cells(6).Value = "Fecha Impresión"
worksheet.Rows(IndexEndTable + 1).Cells(6).Value = DateTime.Now.ToString("dd/MM/yyyy")
worksheet.Rows(IndexEndTable).Cells(4).Value = "Fecha Impresión: "
worksheet.Rows(IndexEndTable + 1).Cells(4).Value = DateTime.Now.ToString()
worksheet.Rows(IndexEndTable).Cells(8).Value = "Impreso en SIG"
End If
End Using