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-10-02 18:05:46 -07:00
parent 0188fc093c 92f69f8b29
commit f07ae42437
15 changed files with 3315 additions and 3449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ventas/CatClientes.aspx
View File

@@ -60,7 +60,7 @@
<asp:DropDownList ID="DdlEstatus" runat="server" CssClass=" form-control input-sm select2me" ValidationGroup="GrpFiltrar" Width="100%">
<asp:ListItem Value="-1">Todos</asp:ListItem>
<asp:ListItem Selected="True" Value="1">Activo</asp:ListItem>
<asp:ListItem Value="2">Inactivo</asp:ListItem>
<asp:ListItem Value="0">Inactivo</asp:ListItem>
</asp:DropDownList>
</div>

26
Ventas/CatPS.aspx
View File

@@ -101,15 +101,19 @@
<li>
<asp:HyperLink NavigateUrl="#" data-toggle="modal" data-target="#DivReportes" ID="ImgReportes" runat="server"> <i class="fa fa-print"></i> Productos sin SAT</asp:HyperLink>
<asp:HyperLink NavigateUrl="#" data-toggle="modal" data-target="#DivReportes" ID="ImgReportes" runat="server"><i style="font-weight:bold" class="fa fa-file-pdf-o"></i> Exportar productos sin SAT</asp:HyperLink>
</li>
<li>
<asp:LinkButton ID="LBImprimir" runat="server"><i class="fa fa-print"></i> Imprimir</asp:LinkButton>
<asp:LinkButton ID="LBImprimir" runat="server"><i style="font-weight:bold" class="fa fa-file-pdf-o"></i> Exportar PDF</asp:LinkButton>
</li>
<li>
<asp:LinkButton ID="LBExcel" runat="server"><i class="fa fa-ad-excel"></i> Exporta Excel</asp:LinkButton>
<asp:LinkButton ID="LBExcel" runat="server"><i style="font-weight:bold" class="fa fa-file-excel-o"></i> Exporta Excel</asp:LinkButton>
</li>
<li>
<asp:LinkButton ID="LBExcelPersonalizado" runat="server"><i style="font-weight:bold" class="fa fa-file-excel-o"></i> Excel Personalizado</asp:LinkButton>
</li>
@@ -216,6 +220,10 @@
</asp:TemplateField>
<asp:BoundField DataField="Fecha" HeaderText="Fecha" DataFormatString="{0:d}" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center" HeaderStyle-HorizontalAlign="Center" />
<asp:BoundField DataField="Usuario" HeaderText="Usuario" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center" HeaderStyle-HorizontalAlign="Center" />
<asp:BoundField DataField="SatPSDescripcion" HeaderText="Producto Servicio SAT" Visible="false" ItemStyle-Width="20px" />
<asp:BoundField DataField="Clasificacion2" HeaderText="Clasificacion 2" Visible="false" ItemStyle-Width="20px" />
<asp:BoundField DataField="Marca" HeaderText="Marca" Visible="false" ItemStyle-Width="20px" />
<asp:BoundField DataField="VentaMinima" HeaderText="Venta Mínima" Visible="false" ItemStyle-Width="20px" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:N2}" />
</Columns>
</asp:GridView>
</ContentTemplate>
@@ -277,11 +285,21 @@
<asp:Label ID="Label1" runat="server" ClientIDMode="Static" Text="Personalizar Columnas"></asp:Label></h4>
</div>
<div class="modal-body">
<table style="width: 335px;" class="table table-striped table-advance table-hover">
<table style="width: 100%;" class="table table-striped table-advance table-hover">
<tbody>
<tr>
<td style="text-align: left;">
<asp:CheckBox ID="ChkAplicaVenta" runat="server" Text="Aplica para Venta" /></td>
<td style="text-align: left;">
<asp:CheckBox ID="ChkProductosServiciosSAT" runat="server" Text="Productos Servicios SAT" /></td>
<td style="text-align: left;">
<asp:CheckBox ID="ChkClasificacion2" runat="server" Text="Clasificación 2" /></td>
<td style="text-align: left;">
<asp:CheckBox ID="ChkMarca" runat="server" Text="Marca" /></td>
</tr>
<tr>
<td style="text-align: left;">
<asp:CheckBox ID="ChkVentaMinima" runat="server" Text="Venta Mínima" /></td>
</tr>
</tbody>
</table>

12
Ventas/CatPS.aspx.vb
View File

@@ -113,6 +113,11 @@ Partial Class CatPS
AplicaVenta = False
End If
GvDatos.Columns(10).Visible = ChkProductosServiciosSAT.Checked
GvDatos.Columns(11).Visible = ChkClasificacion2.Checked
GvDatos.Columns(12).Visible = ChkMarca.Checked
GvDatos.Columns(13).Visible = ChkVentaMinima.Checked
CargaDatos()
OrdenaDatos()
UPDatos.Update()
@@ -255,6 +260,13 @@ Partial Class CatPS
ImprimirbytesPDF(ImprimirPDFCrystal(Server.MapPath("~/Empresas/Grales/Formatos/CatPS.rpt"), DtDatos, lista, "Productos y Servicios", Formato), "Productos y Servicios", Formato)
End Sub
Protected Sub LBExcelPersonalizado_Click(Sender As Object, e As EventArgs) Handles LBExcelPersonalizado.Click
ExportToExcelGembox(GvDatos, "Catálogo de Productos y Servicios", UsuarioActual, "", "", "Catálogo de Productos y Servicios", "", -1)
End Sub
Public Overrides Sub VerifyRenderingInServerForm(control As Control)
End Sub
#End Region
End Class