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:
JORGE LUIS CAUDILLO ESPARZA
2022-04-21 08:56:53 -07:00
parent f6d29355d2 31fff2fccc
commit 6e152a8d38
22 changed files with 265 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Compras/Compras.aspx.vb
View File

@@ -2194,9 +2194,8 @@ Partial Class Compras_Compras
DdlRetISRConcepto.Items.Clear()
DdlRetISRConcepto.Items.Insert(0, New ListItem("Honorarios", "1"))
DdlRetISRConcepto.Items.Insert(1, New ListItem("Arrendamiento", "2"))
If UsuarioActual.CveEmpresa.Contiene(119, 7, 11, 12, 122, 145) Then
DdlRetISRConcepto.Items.Insert(1, New ListItem("Resico", "3"))
End If
DdlRetISRConcepto.Items.Insert(1, New ListItem("Resico", "3"))
End If
UpPS.Update()
End Sub
@@ -14675,7 +14674,7 @@ Partial Class Compras_Compras
Protected Sub BtnRefacturacionVer_Click(sender As Object, e As EventArgs) Handles BtnRefacturacionVer.Click
Dim Opcion As Integer = 1
If UsuarioActual.CveEmpresa.Contiene(119, 1) Then Opcion = 2
If UsuarioActual.CveEmpresa.Contiene(119, 1, 140) Then Opcion = 2
Dim ObjCompras As New ClsCompras
@@ -20315,10 +20314,14 @@ Partial Class Compras_Compras
ObjCompras.Dispose()
Dim ObjInv As New ClsInventarios
If ObjInv.GetFletes(UsuarioActual.CveEmpresa, OpcionInventario:=1) Then
DdlFletes.DataSource = ObjInv.DtResultados
If ObjInv.GetFletesRep(UsuarioActual.CveEmpresa, -1, "-1", -1, -1, -1, MinFecha, MaxFecha, TipoGasto:=1, CveEstatus:=0) Then
DdlFletes.DataSource = ObjInv.DtResultados.FiltraParametros("CveFlete > 0")
DdlFletes.Items.Insert(0, New ListItem("Seleccione", "-1"))
End If
'If ObjInv.GetFletes(UsuarioActual.CveEmpresa, OpcionInventario:=1) Then
' DdlFletes.DataSource = ObjInv.DtResultados
' DdlFletes.Items.Insert(0, New ListItem("Seleccione", "-1"))
'End If
ObjInv.Dispose()
DdlImportaciones.DataBind()

22
Compras/Proveedores.aspx
View File

@@ -1524,22 +1524,22 @@
<asp:Literal ID="LtlDiasVencido" runat="server" Text='<%# Eval("DiasVencidos", "{0}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Total">
<asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlSaldoOriginal" runat="server" Text='<%# Eval("Original", "{0:N2}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Abonado">
<asp:TemplateField HeaderText="Abonado" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlAbonado" runat="server" Text='<%# Eval("Abonado", "{0:N2}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="% Abonado">
<asp:TemplateField HeaderText="% Abonado" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlPorRecuperado" runat="server" Text='<%# Eval("PorPagado", "{0:N2}%") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Saldo">
<asp:TemplateField HeaderText="Saldo" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlSaldo" runat="server" Text='<%# Eval("Saldo", "{0:N2}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
@@ -1602,37 +1602,37 @@
</div>
<asp:GridView ID="GvCxPHistorial" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontró Historial de Cuentas X Pagar" CssClass="table table-striped table-hover Widthall ScrollAD" data-sort="true" GridLines="None" BorderColor="#D3D3D3" BorderWidth="1">
<Columns>
<asp:TemplateField HeaderText="Factura">
<asp:TemplateField HeaderText="SerieFolio">
<ItemTemplate>
<asp:Label ID="LtlFactura" runat="server"></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Fecha Compra">
<asp:TemplateField HeaderText="Fecha">
<ItemTemplate>
<asp:Literal ID="LtlFecha" runat="server" Text='<%# Eval("Fecha", "{0:d}") %>'></asp:Literal>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Fecha Vencimiento">
<asp:TemplateField HeaderText="F. Vencimiento">
<ItemTemplate>
<asp:Literal ID="LtlFechaVenci" runat="server" Text='<%# Eval("FechaVencimiento", "{0:d}") %>'></asp:Literal>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Días Vencidos">
<asp:TemplateField HeaderText="Días Venc.">
<ItemTemplate>
<asp:Literal ID="LtlDiasVencido" runat="server" Text='<%# Eval("DiasVencidos", "{0}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Monto Compra (Saldo Orig)">
<asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlSaldoOriginal" runat="server" Text='<%# Eval("Original", "{0:N2}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Abonado">
<asp:TemplateField HeaderText="Abonado" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlAbonado" runat="server" Text='<%# Eval("Abonado", "{0:N2}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="% Pagado">
<asp:TemplateField HeaderText="% Pagado" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlPorRecuperado" runat="server" Text='<%# Eval("PorPagado", "{0:N2}%") %>'></asp:Literal>&nbsp;
</ItemTemplate>

6
Compras/Proveedores.aspx.vb
View File

@@ -2613,12 +2613,6 @@ Partial Class Compras_Proveedores
End If
e.Row.Cells(5).HorizontalAlign = HorizontalAlign.Right
e.Row.Cells(6).HorizontalAlign = HorizontalAlign.Right
e.Row.Cells(7).HorizontalAlign = HorizontalAlign.Right
e.Row.Cells(8).HorizontalAlign = HorizontalAlign.Right
If e.Row.DBCampo("Saldo").ToDouble < 0 Then e.Row.Cells(6).ForeColor = Drawing.Color.Red
If e.Row.DBCampo("DiasVencidos").ToDouble > 0 AndAlso CType(sender, GridView).ID = "GvCxP" Then e.Row.Cells(4).ForeColor = Drawing.Color.Red