diff --git a/Compras/RepCxP.aspx.vb b/Compras/RepCxP.aspx.vb index c63fb42cb..f22fe1d7f 100644 --- a/Compras/RepCxP.aspx.vb +++ b/Compras/RepCxP.aspx.vb @@ -1065,78 +1065,53 @@ Partial Class Compras_RepCxP If chkAgruparMes.Checked Then DtExcel = (From row As DataRow In Mov.DtResultados.Rows Select New With - { - .GPO = row.Item("GPO"), - .Saldo = row.Item("Saldo"), - .TotalVencido = row.Item("vencido"), - .Mes1 = row.Item("Mes1"), - .Mes2 = row.Item("Mes2"), - .Mes3 = row.Item("Mes3"), - .Mes4 = row.Item("Mes4"), - .Mes5 = row.Item("Mes5"), - .Mes6 = row.Item("Mes6"), - .Mes7 = row.Item("Mes7"), - .Mes8 = row.Item("Mes8"), - .Mes9 = row.Item("Mes9"), - .Mes10 = row.Item("Mes10"), - .Mes11 = row.Item("Mes11"), - .Mes12 = row.Item("Mes12"), - .Mes13 = row.Item("Mes13"), - .TotalxVencer = row.Item("por_vencer") - }).QueryToDataTable(True) - Else - DtExcel = (From row As DataRow In Mov.DtResultados.Rows - Select New With - { + { .GPO = row.Item("GPO"), .Saldo = row.Item("Saldo"), - .Columna1vencido = row.Item("Columna1"), - .Columna2vencido = row.Item("Columna2"), - .Columna3vencido = row.Item("Columna3"), - .Columna4vencido = row.Item("Columna4"), - .Columna5vencido = row.Item("Columna5"), - .Columna6vencido = row.Item("Columna6"), - .Columna7vencido = row.Item("Columna7"), - .Columna8vencido = row.Item("Columna8"), - .Columna9vencido = row.Item("Columna9"), - .Columna10vencido = row.Item("Columna10"), - .Columna11vencido = row.Item("Columna11"), - .Columna12vencido = row.Item("Columna12"), - .Columna13vencido = row.Item("Columna13"), .TotalVencido = row.Item("vencido"), - .Columna1xVencer = row.Item("Columna1"), - .Columna2xVencer = row.Item("Columna2"), - .Columna3xVencer = row.Item("Columna3"), - .Columna4xVencer = row.Item("Columna4"), - .Columna5xVencer = row.Item("Columna5"), - .Columna6xVencer = row.Item("Columna6"), - .Columna7xVencer = row.Item("Columna7"), - .Columna8xVencer = row.Item("Columna8"), - .Columna9xVencer = row.Item("Columna9"), - .Columna10xVencer = row.Item("Columna10"), - .Columna11xVencer = row.Item("Columna11"), - .Columna12xVencer = row.Item("Columna12"), - .Columna13xVencer = row.Item("Columna13"), + .Mes1 = row.Item("Mes1"), + .Mes2 = row.Item("Mes2"), + .Mes3 = row.Item("Mes3"), + .Mes4 = row.Item("Mes4"), + .Mes5 = row.Item("Mes5"), + .Mes6 = row.Item("Mes6"), + .Mes7 = row.Item("Mes7"), + .Mes8 = row.Item("Mes8"), + .Mes9 = row.Item("Mes9"), + .Mes10 = row.Item("Mes10"), + .Mes11 = row.Item("Mes11"), + .Mes12 = row.Item("Mes12"), + .Mes13 = row.Item("Mes13"), .TotalxVencer = row.Item("por_vencer") }).QueryToDataTable(True) - End If - Mov.Dispose() + Dim RowDolares As Integer = 0 + For Each row As DataRow In DtExcel.Rows + If row("GPO").ToString = "Dólares" Then + RowDolares += 1 + Exit For + Else + RowDolares += 1 + End If + Next + worksheet.InsertDataTable(DtExcel, New InsertDataTableOptions() With + { + .ColumnHeaders = True, + .StartRow = 0, + .StartColumn = 0 + }) + worksheet.Columns("B").Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(217, 217, 217), SpreadsheetColor.FromArgb(255, 255, 255)) + worksheet.Columns("C").Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(217, 217, 217), SpreadsheetColor.FromArgb(255, 255, 255)) + worksheet.Columns("Q").Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(217, 217, 217), SpreadsheetColor.FromArgb(255, 255, 255)) + worksheet.Rows(0).Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(217, 217, 217), SpreadsheetColor.FromArgb(255, 255, 255)) + worksheet.Rows(1).Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(103, 128, 159), SpreadsheetColor.FromArgb(255, 255, 255)) + worksheet.Rows(RowDolares).Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(103, 128, 159), SpreadsheetColor.FromArgb(255, 255, 255)) - worksheet.InsertDataTable(DtExcel, New InsertDataTableOptions() With - { - .ColumnHeaders = True, - .StartRow = 0, - .StartColumn = 0 - }) + Dim columnCount = worksheet.CalculateMaxUsedColumns() + For i = 0 To columnCount + worksheet.Columns(i).AutoFit(1, worksheet.Rows(0), worksheet.Rows(worksheet.Rows.Count - 1)) + Next - Dim columnCount = worksheet.CalculateMaxUsedColumns() - For i = 0 To columnCount - worksheet.Columns(i).AutoFit(1, worksheet.Rows(0), worksheet.Rows(worksheet.Rows.Count - 1)) - Next - - - If chkAgruparMes.Checked Then worksheet.Cells("A1").Value = DdlGrupo.SelectedItem.Text worksheet.Cells("D1").Value = Mes(0) worksheet.Cells("E1").Value = Mes(1) @@ -1151,200 +1126,248 @@ Partial Class Compras_RepCxP worksheet.Cells("N1").Value = Mes(10) worksheet.Cells("O1").Value = Mes(11) worksheet.Cells("P1").Value = Mes(12) - Else - Dim Vencido As Integer = 0 - Dim Xvencer As Integer = 0 - If Dr("TC1").ToString.ToEntero = 1 Then - worksheet.Cells("C1").Value = Dr("NomC1").ToString - Vencido += 1 - ElseIf Dr("TC1").ToString.ToEntero = 2 Then - worksheet.Cells("Q1").Value = Dr("NomC1").ToString - Xvencer += 1 - End If - If Dr("TC2").ToString.ToEntero = 1 Then - worksheet.Cells("D1").Value = Dr("NomC2").ToString - Vencido += 1 - ElseIf Dr("TC2").ToString.ToEntero = 2 Then - worksheet.Cells("R1").Value = Dr("NomC2").ToString - Xvencer += 1 - End If - If Dr("TC3").ToString.ToEntero = 1 Then - worksheet.Cells("E1").Value = Dr("NomC3").ToString - Vencido += 1 - ElseIf Dr("TC3").ToString.ToEntero = 2 Then - worksheet.Cells("S1").Value = Dr("NomC3").ToString - Xvencer += 1 - End If - If Dr("TC4").ToString.ToEntero = 1 Then - worksheet.Cells("F1").Value = Dr("NomC4").ToString - Vencido += 1 - ElseIf Dr("TC4").ToString.ToEntero = 2 Then - worksheet.Cells("T1").Value = Dr("NomC4").ToString - Xvencer += 1 - End If - If Dr("TC5").ToString.ToEntero = 1 Then - worksheet.Cells("G1").Value = Dr("NomC5").ToString - Vencido += 1 - ElseIf Dr("TC5").ToString.ToEntero = 2 Then - worksheet.Cells("U1").Value = Dr("NomC5").ToString - Xvencer += 1 - End If - If Dr("TC6").ToString = "1" Then - worksheet.Cells("H1").Value = Dr("NomC6").ToString - Vencido += 1 - ElseIf Dr("TC6").ToString.ToEntero = 2 Then - worksheet.Cells("V1").Value = Dr("NomC6").ToString - Xvencer += 1 - End If - If Dr("TC7").ToString.ToEntero = 1 Then - worksheet.Cells("I1").Value = Dr("NomC7").ToString - Vencido += 1 - ElseIf Dr("TC7").ToString.ToEntero = 2 Then - worksheet.Cells("W1").Value = Dr("NomC7").ToString - Xvencer += 1 - End If - If Dr("TC8").ToString.ToEntero = 1 Then - worksheet.Cells("J1").Value = Dr("NomC8").ToString - Vencido += 1 - ElseIf Dr("TC8").ToString.ToEntero = 2 Then - worksheet.Cells("X1").Value = Dr("NomC8").ToString - Xvencer += 1 - End If - If Dr("TC9").ToString.ToEntero = 1 Then - worksheet.Cells("K1").Value = Dr("NomC9").ToString - Vencido += 1 - ElseIf Dr("TC9").ToString.ToEntero = 2 Then - worksheet.Cells("Y1").Value = Dr("NomC9").ToString - Xvencer += 1 - End If - If Dr("TC10").ToString.ToEntero = 1 Then - worksheet.Cells("L1").Value = Dr("NomC10").ToString - Vencido += 1 - ElseIf Dr("TC10").ToString.ToEntero = 2 Then - worksheet.Cells("Z1").Value = Dr("NomC10").ToString - Xvencer += 1 - End If - If Dr("TC11").ToString.ToEntero = 1 Then - worksheet.Cells("M1").Value = Dr("NomC11").ToString - Vencido += 1 - ElseIf Dr("TC11").ToString.ToEntero = 2 Then - worksheet.Cells("AA1").Value = Dr("NomC11").ToString - Xvencer += 1 - End If - If Dr("TC12").ToString.ToEntero = 1 Then - worksheet.Cells("N1").Value = Dr("NomC12").ToString - Vencido += 1 - ElseIf Dr("TC12").ToString.ToEntero = 2 Then - worksheet.Cells("AB1").Value = Dr("NomC12").ToString - Xvencer += 1 - End If - If Dr("TC13").ToString.ToEntero = 1 Then - worksheet.Cells("O1").Value = Dr("NomC13").ToString - Vencido += 1 - ElseIf Dr("TC13").ToString.ToEntero = 2 Then - worksheet.Cells("AC1").Value = Dr("NomC13").ToString - Xvencer += 1 - End If - - - If Dr("TC13").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(28) - End If - If Dr("TC12").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(27) - End If - - If Dr("TC11").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(26) - End If - - If Dr("TC10").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(25) - End If - If Dr("TC9").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(24) - End If - - If Dr("TC8").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(23) - End If - If Dr("TC7").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(22) - End If - - If Dr("TC6").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(21) - End If - If Dr("TC5").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(20) - End If - - If Dr("TC4").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(19) - End If - If Dr("TC3").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(18) - End If - If Dr("TC2").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(17) - End If - If Dr("TC1").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(16) - End If - - - If Dr("TC13").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(14) - End If - - If Dr("TC12").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(13) - End If - - If Dr("TC11").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(12) - End If - - If Dr("TC10").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(11) - End If - If Dr("TC9").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(10) - End If - - If Dr("TC8").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(9) - End If - If Dr("TC7").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(8) - End If - - If Dr("TC6").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(7) - End If - If Dr("TC5").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(6) - End If - - If Dr("TC4").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(5) - End If - If Dr("TC3").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(4) - End If - If Dr("TC2").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(3) - End If - If Dr("TC1").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(2) - End If - End If - NombreArchivo = "CxP" - workbook.Save(Response, $"{NombreArchivo}.xlsx", SaveOptions.XlsxDefault) - 'GenerarPDF("EXCEL") + workbook.Save(Response, $"{NombreArchivo}.xlsx", SaveOptions.XlsxDefault) + Else + 'DtExcel = (From row As DataRow In Mov.DtResultados.Rows + ' Select New With + ' { + ' .GPO = row.Item("GPO"), + ' .Saldo = row.Item("Saldo"), + ' .Columna1vencido = row.Item("Columna1"), + ' .Columna2vencido = row.Item("Columna2"), + ' .Columna3vencido = row.Item("Columna3"), + ' .Columna4vencido = row.Item("Columna4"), + ' .Columna5vencido = row.Item("Columna5"), + ' .Columna6vencido = row.Item("Columna6"), + ' .Columna7vencido = row.Item("Columna7"), + ' .Columna8vencido = row.Item("Columna8"), + ' .Columna9vencido = row.Item("Columna9"), + ' .Columna10vencido = row.Item("Columna10"), + ' .Columna11vencido = row.Item("Columna11"), + ' .Columna12vencido = row.Item("Columna12"), + ' .Columna13vencido = row.Item("Columna13"), + ' .TotalVencido = row.Item("vencido"), + ' .Columna1xVencer = row.Item("Columna1"), + ' .Columna2xVencer = row.Item("Columna2"), + ' .Columna3xVencer = row.Item("Columna3"), + ' .Columna4xVencer = row.Item("Columna4"), + ' .Columna5xVencer = row.Item("Columna5"), + ' .Columna6xVencer = row.Item("Columna6"), + ' .Columna7xVencer = row.Item("Columna7"), + ' .Columna8xVencer = row.Item("Columna8"), + ' .Columna9xVencer = row.Item("Columna9"), + ' .Columna10xVencer = row.Item("Columna10"), + ' .Columna11xVencer = row.Item("Columna11"), + ' .Columna12xVencer = row.Item("Columna12"), + ' .Columna13xVencer = row.Item("Columna13"), + ' .TotalxVencer = row.Item("por_vencer") + ' }).QueryToDataTable(True) + GenerarPDF("EXCEL") + + End If + Mov.Dispose() + + + + + + 'If chkAgruparMes.Checked Then + + 'Else + ' Dim Vencido As Integer = 0 + ' Dim Xvencer As Integer = 0 + ' If Dr("TC1").ToString.ToEntero = 1 Then + ' worksheet.Cells("C1").Value = Dr("NomC1").ToString + ' Vencido += 1 + ' ElseIf Dr("TC1").ToString.ToEntero = 2 Then + ' worksheet.Cells("Q1").Value = Dr("NomC1").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC2").ToString.ToEntero = 1 Then + ' worksheet.Cells("D1").Value = Dr("NomC2").ToString + ' Vencido += 1 + ' ElseIf Dr("TC2").ToString.ToEntero = 2 Then + ' worksheet.Cells("R1").Value = Dr("NomC2").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC3").ToString.ToEntero = 1 Then + ' worksheet.Cells("E1").Value = Dr("NomC3").ToString + ' Vencido += 1 + ' ElseIf Dr("TC3").ToString.ToEntero = 2 Then + ' worksheet.Cells("S1").Value = Dr("NomC3").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC4").ToString.ToEntero = 1 Then + ' worksheet.Cells("F1").Value = Dr("NomC4").ToString + ' Vencido += 1 + ' ElseIf Dr("TC4").ToString.ToEntero = 2 Then + ' worksheet.Cells("T1").Value = Dr("NomC4").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC5").ToString.ToEntero = 1 Then + ' worksheet.Cells("G1").Value = Dr("NomC5").ToString + ' Vencido += 1 + ' ElseIf Dr("TC5").ToString.ToEntero = 2 Then + ' worksheet.Cells("U1").Value = Dr("NomC5").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC6").ToString = "1" Then + ' worksheet.Cells("H1").Value = Dr("NomC6").ToString + ' Vencido += 1 + ' ElseIf Dr("TC6").ToString.ToEntero = 2 Then + ' worksheet.Cells("V1").Value = Dr("NomC6").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC7").ToString.ToEntero = 1 Then + ' worksheet.Cells("I1").Value = Dr("NomC7").ToString + ' Vencido += 1 + ' ElseIf Dr("TC7").ToString.ToEntero = 2 Then + ' worksheet.Cells("W1").Value = Dr("NomC7").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC8").ToString.ToEntero = 1 Then + ' worksheet.Cells("J1").Value = Dr("NomC8").ToString + ' Vencido += 1 + ' ElseIf Dr("TC8").ToString.ToEntero = 2 Then + ' worksheet.Cells("X1").Value = Dr("NomC8").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC9").ToString.ToEntero = 1 Then + ' worksheet.Cells("K1").Value = Dr("NomC9").ToString + ' Vencido += 1 + ' ElseIf Dr("TC9").ToString.ToEntero = 2 Then + ' worksheet.Cells("Y1").Value = Dr("NomC9").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC10").ToString.ToEntero = 1 Then + ' worksheet.Cells("L1").Value = Dr("NomC10").ToString + ' Vencido += 1 + ' ElseIf Dr("TC10").ToString.ToEntero = 2 Then + ' worksheet.Cells("Z1").Value = Dr("NomC10").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC11").ToString.ToEntero = 1 Then + ' worksheet.Cells("M1").Value = Dr("NomC11").ToString + ' Vencido += 1 + ' ElseIf Dr("TC11").ToString.ToEntero = 2 Then + ' worksheet.Cells("AA1").Value = Dr("NomC11").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC12").ToString.ToEntero = 1 Then + ' worksheet.Cells("N1").Value = Dr("NomC12").ToString + ' Vencido += 1 + ' ElseIf Dr("TC12").ToString.ToEntero = 2 Then + ' worksheet.Cells("AB1").Value = Dr("NomC12").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC13").ToString.ToEntero = 1 Then + ' worksheet.Cells("O1").Value = Dr("NomC13").ToString + ' Vencido += 1 + ' ElseIf Dr("TC13").ToString.ToEntero = 2 Then + ' worksheet.Cells("AC1").Value = Dr("NomC13").ToString + ' Xvencer += 1 + ' End If + + + ' If Dr("TC13").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(28) + ' End If + ' If Dr("TC12").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(27) + ' End If + + ' If Dr("TC11").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(26) + ' End If + + ' If Dr("TC10").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(25) + ' End If + ' If Dr("TC9").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(24) + ' End If + + ' If Dr("TC8").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(23) + ' End If + ' If Dr("TC7").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(22) + ' End If + + ' If Dr("TC6").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(21) + ' End If + ' If Dr("TC5").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(20) + ' End If + + ' If Dr("TC4").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(19) + ' End If + ' If Dr("TC3").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(18) + ' End If + ' If Dr("TC2").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(17) + ' End If + ' If Dr("TC1").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(16) + ' End If + + + ' If Dr("TC13").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(14) + ' End If + + ' If Dr("TC12").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(13) + ' End If + + ' If Dr("TC11").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(12) + ' End If + + ' If Dr("TC10").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(11) + ' End If + ' If Dr("TC9").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(10) + ' End If + + ' If Dr("TC8").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(9) + ' End If + ' If Dr("TC7").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(8) + ' End If + + ' If Dr("TC6").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(7) + ' End If + ' If Dr("TC5").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(6) + ' End If + + ' If Dr("TC4").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(5) + ' End If + ' If Dr("TC3").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(4) + ' End If + ' If Dr("TC2").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(3) + ' End If + ' If Dr("TC1").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(2) + ' End If + 'End If + + + + End Sub Private Sub ImgImprimir_Click(sender As Object, e As EventArgs) Handles ImgImprimir.Click diff --git a/Contabilidad/RegPrePolizaS.aspx.vb b/Contabilidad/RegPrePolizaS.aspx.vb index 6993700c2..706b97522 100644 --- a/Contabilidad/RegPrePolizaS.aspx.vb +++ b/Contabilidad/RegPrePolizaS.aspx.vb @@ -1911,7 +1911,11 @@ Partial Class ContabilidadC_RegPrePolizaS Dim NombreArchivo As String SpreadsheetInfo.SetLicense(ModExtensiones.SerialGemBoxSpreadsheet) Dim workbook As New ExcelFile() - Dim worksheet = workbook.Worksheets.Add(DdlPlantilla2.SelectedItem.Text.ToString) + Dim NombreHoja As String = DdlPlantilla2.SelectedItem.Text.ToString + If NombreHoja.Length > 30 Then + NombreHoja = NombreHoja.Substring(0, 29) + End If + Dim worksheet = workbook.Worksheets.Add(NombreHoja) Dim CvePlantilla As Integer = DdlPlantilla2.SelectedValue.ToEntero Dim Dt As DataTable = GlobalDTContaPlantillasPolizasDetalle(CvePlantilla).FiltraParametros(String.Format("CveEmpresa={0}", UsuarioActual.CveEmpresa), "Orden") diff --git a/Inventarios/InventarioFisico.aspx.vb b/Inventarios/InventarioFisico.aspx.vb index a81812484..619d2ea0d 100644 --- a/Inventarios/InventarioFisico.aspx.vb +++ b/Inventarios/InventarioFisico.aspx.vb @@ -135,6 +135,16 @@ Partial Class Inventarios_InventarioFisico UpProductosServicios.Update() UPPPSExcluye.Update() End Sub + + Private Sub CargaGvProveedores() + Dim ObjInventario As New ClsInventarios() + If ObjInventario.GetInventarioFisicoDetallesProveedores(HdnID.Value, UsuarioActual.CveEmpresa) Then + GvProveedor.DataSource = ObjInventario.DtResultados.FiltraParametros("Incluye = 1") + End If + ObjInventario.Dispose() + GvProveedor.DataBind() + UpProveedor.Update() + End Sub Private Sub CargaDdlSubProyectos() CargarCentrosDeCosto(Nothing, DdlSubProyecto, Nothing, LblSubProyecto) CargarCentrosDeCosto(Nothing, DdlFiltroSubProyecto, Nothing, LblFiltroSubProyecto) @@ -316,6 +326,7 @@ Partial Class Inventarios_InventarioFisico #End Region +#Region "PROVEEDORES" Private Sub BtnAgregarProveedor_Click(sender As Object, e As EventArgs) Handles BtnAgregarProveedor.Click If DdlProveedor.SelectedValue = -1 Then Alert("Tienes seleccionada la opcion 'Todos'.", TipoMensaje.MsgInformacion) @@ -348,6 +359,7 @@ Partial Class Inventarios_InventarioFisico GvProveedor.DataBind() UpProveedor.Update() End Sub +#End Region #Region "INVENTARIO FISICO" Public Sub Delete_Click(sender As Object, e As EventArgs) @@ -366,6 +378,12 @@ Partial Class Inventarios_InventarioFisico Public Sub Edit_Click(sender As Object, e As EventArgs) Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow) + DdlProductosServicios.ddl.SelectedValueExist(-1) + DdlProveedor.ddl.SelectedValueExist(-1) + DdlPSExcluye.ddl.SelectedValueExist(-1) + DdlClasificacion.SelectedValueExist(-1) + DdlClasificacionExcluida.SelectedValueExist(-1) + tDTClasif.Rows.Clear() tDTClasifExcluye.Rows.Clear() tDTPS.Rows.Clear() @@ -392,10 +410,12 @@ Partial Class Inventarios_InventarioFisico CargaGvAlmacen() CargaGvClasificacion() CargaGvProductosServicios() + CargaGvProveedores() tDTClasif = GvClasificacion.DataSource tDTClasifExcluye = GvClasificacionExcluida.DataSource tDTPS = GvPS.DataSource tDTPSExcluye = GvPSExcluye.DataSource + tDTProv = GvProveedor.DataSource tALM = GvAlmacen.DataSource UpAddInventarioFisico.Update() RegistraScript(String.Format("$('#{0}').modal('show');", "divAddInventarioFisico")) @@ -413,8 +433,16 @@ Partial Class Inventarios_InventarioFisico tDTPSExcluye.Rows.Clear() tDTClasifExcluye.Rows.Clear() tALM.Rows.Clear() + tDTProv.Rows.Clear() End If + DdlProductosServicios.ddl.SelectedValueExist(-1) + DdlPSExcluye.ddl.SelectedValueExist(-1) + DdlProveedor.ddl.SelectedValueExist(-1) + + DdlClasificacion.SelectedValueExist(-1) + DdlClasificacionExcluida.SelectedValueExist(-1) + HdnModalidad.Value = "A" UppInventarioFisico.Update() BtnAgregarInventarioFisico.Text = "Agregar" @@ -431,6 +459,8 @@ Partial Class Inventarios_InventarioFisico GvPS.DataBind() GvPSExcluye.DataSource = Nothing GvPSExcluye.DataBind() + GvProveedor.DataSource = Nothing + GvProveedor.DataBind() UpAddInventarioFisico.Update() RegistraScript("$('#divAddInventarioFisico').modal('show');") diff --git a/PortalProveedor/PortalProveedor.aspx b/PortalProveedor/PortalProveedor.aspx index 28c9c6951..4bcd4e740 100644 --- a/PortalProveedor/PortalProveedor.aspx +++ b/PortalProveedor/PortalProveedor.aspx @@ -196,7 +196,7 @@ Aplica NC - + <%----%> @@ -246,7 +246,13 @@ - + + Aplica NC + + + + + <%----%>