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
2023-02-01 20:45:34 -07:00
parent b0bd70ddbf ed012cb59b
commit a8fbe374c3
6 changed files with 6276 additions and 5125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
App_Code/ClsPaginas.vb
View File

@@ -12,7 +12,6 @@ Imports Microsoft.Reporting.WebForms
Imports Newtonsoft.Json Imports Newtonsoft.Json
Imports Newtonsoft.Json.Linq Imports Newtonsoft.Json.Linq
'NOTA AD TEAM 'NOTA AD TEAM
'COLOR PARA ROW TOTAL EN REPORT VIEWER: #67809F (AZULITO) 'COLOR PARA ROW TOTAL EN REPORT VIEWER: #67809F (AZULITO)
@@ -46,8 +45,6 @@ Public Class ClsPaginas
End Property End Property
#Region "Propiedades" #Region "Propiedades"
Private Shared ReadOnly Property Rand As New Random()
Private Property SubReportData As Modelos.MSubReportData Private Property SubReportData As Modelos.MSubReportData
Get Get
Return If(IsNothing(ViewState("SubReportData")), Nothing, DirectCast(ViewState("SubReportData"), Modelos.MSubReportData)) Return If(IsNothing(ViewState("SubReportData")), Nothing, DirectCast(ViewState("SubReportData"), Modelos.MSubReportData))
@@ -6122,7 +6119,7 @@ Public Class ClsPaginas
Public Shared Sub RegistraScript(Script As String, Optional valuetick As String = "") Public Shared Sub RegistraScript(Script As String, Optional valuetick As String = "")
Dim page As Page = TryCast(HttpContext.Current.CurrentHandler, Page) Dim page As Page = TryCast(HttpContext.Current.CurrentHandler, Page)
Script = $"{Script.TrimEnd(";"c)};" 'sino trae ";" al final, se lo agregamos Script = $"{Script.TrimEnd(";"c)};" 'sino trae ";" al final, se lo agregamos
ScriptManager.RegisterStartupScript(page, page.GetType(), $"{DateTime.Now.Ticks + 1}{Rand.Next()}{valuetick}", Script, True) ScriptManager.RegisterStartupScript(page, page.GetType(), $"{DateTime.Now.Ticks + 1}{ThreadSafeRandom.Next()}{valuetick}", Script, True)
End Sub End Sub
Public Sub TabEnabled(Tab As System.Web.UI.HtmlControls.HtmlAnchor, Valor As Boolean) Public Sub TabEnabled(Tab As System.Web.UI.HtmlControls.HtmlAnchor, Valor As Boolean)
If Valor Then If Valor Then

16
App_Code/ThreadSafeRandom.vb Normal file
View File

@@ -0,0 +1,16 @@
Imports System.Threading
NotInheritable Class ThreadSafeRandom
Private Sub New()
'Impide que se instancie la clase (equivalente a static class en C#)
End Sub
Private Shared ReadOnly GlobalRandom As New Random()
Private Shared ReadOnly LocalRandom As New ThreadLocal(Of Random)(Function()
SyncLock GlobalRandom
Return New Random(GlobalRandom.Next())
End SyncLock
End Function)
Public Shared Function [Next](Optional min As Integer = 0, Optional max As Integer = Integer.MaxValue) As Integer
Return LocalRandom.Value.Next(min, max)
End Function
End Class

41
Compras/Proveedores.aspx
View File

@@ -1468,7 +1468,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="pull-right"> <div class="pull-right">
<asp:HyperLink ID="HplAbonarMasivo" Visible="False" runat="server" CssClass="Texto" NavigateUrl="#" ToolTip="Pago de múltiples facturas">Pago múltiples facturas <img src="/Imagenes/Money_Add.png" alt="Pagar múltiples facturas" /></asp:HyperLink>&nbsp; &nbsp;&nbsp;&nbsp
</div> </div>
</div> </div>
<div class="portlet light xspadding bordered "> <div class="portlet light xspadding bordered ">
@@ -1480,35 +1480,39 @@
</div> </div>
<div class="actions"> <div class="actions">
<div class="btn-group"> <div class="btn-group">
</div>
</div>
<div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""></a>
<a href="javascript:;" class="fullscreen" data-original-title="" title=""></a>
<a href="javascript:;" class="remove" data-original-title="" title=""></a>
</div>
<div class="actions">
<div class="btn-group">
<asp:UpdatePanel UpdateMode="Conditional" runat="server" ID="UpdatePanel4"> <asp:UpdatePanel UpdateMode="Conditional" runat="server" ID="UpdatePanel4">
<ContentTemplate> <ContentTemplate>
<asp:HyperLink ID="HplAbonarMasivo" Visible="False" runat="server" CssClass="Texto" NavigateUrl="#" ToolTip="Pago de múltiples facturas">Pago múltiples facturas <img src="/Imagenes/Money_Add.png" alt="Pagar múltiples facturas" /></asp:HyperLink>&nbsp;
<asp:LinkButton ID="LnkCxPActivasPDF" runat="server" data-toggle="tooltip" Title="PDF"> <i class="fa fa-file-pdf-o" style="margin-right: 10px; font-size:15px; font-weight:bold; color:dimgray;"></i> </asp:LinkButton> <asp:LinkButton ID="LnkCxPActivasPDF" runat="server" data-toggle="tooltip" Title="PDF"> <i class="fa fa-file-pdf-o" style="margin-right: 10px; font-size:15px; font-weight:bold; color:dimgray;"></i> </asp:LinkButton>
<asp:LinkButton ID="LnkCxPActivasExcel" runat="server" data-toggle="tooltip" Title="Excel"><i class="fa fa-file-excel-o" style="margin-right: 10px; font-size:15px; font-weight:bold; color:dimgray;"></i> </asp:LinkButton> <asp:LinkButton ID="LnkCxPActivasExcel" runat="server" data-toggle="tooltip" Title="Excel"><i class="fa fa-file-excel-o" style="margin-right: 10px; font-size:15px; font-weight:bold; color:dimgray;"></i> </asp:LinkButton>
<input type="text" id="TxtBusqueda2" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda2','{0}')", GvCxP.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda2','{0}')", GvCxP.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
</ContentTemplate> </ContentTemplate>
<Triggers> <Triggers>
<asp:PostBackTrigger ControlID="LnkCxPActivasPDF" /> <asp:PostBackTrigger ControlID="LnkCxPActivasPDF" />
<asp:PostBackTrigger ControlID="LnkCxPActivasExcel" /> <asp:PostBackTrigger ControlID="LnkCxPActivasExcel" />
</Triggers> </Triggers>
</asp:UpdatePanel> </asp:UpdatePanel>
</div>
</div>
<div class="tools">
</div>
<div class="actions">
<div class="btn-group">
</div> </div>
</div> </div>
</div> </div>
<div class="portlet-body "> <div class="portlet-body ">
<div class="row" style="margin-right: 10px;" align="right"> <div class="row" style="margin-right: 10px;" align="right">
<input type="text" id="TxtBusqueda2" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda2','{0}')", GvCxP.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda2','{0}')", GvCxP.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
</div> </div>
<asp:GridView ID="GvCxP" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontraron Cuentas X Pagar Pendientes" <asp:GridView ID="GvCxP" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontraron Cuentas X Pagar Pendientes"
CssClass="table Widthall table-striped table-hover ScrollAD" data-sort="true" GridLines="None" BorderColor="#D3D3D3" BorderWidth="1" DataKeyNames="CveCompra"> CssClass="table Widthall table-striped table-hover ScrollAD" data-sort="true" GridLines="None" BorderColor="#D3D3D3" BorderWidth="1" DataKeyNames="CveCompra">
@@ -1590,7 +1594,7 @@
</div> </div>
<div class="tools"> <div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""></a> <%--<a href="javascript:;" class="collapse" data-original-title="" title=""></a>--%>
</div> </div>
<div class="actions"> <div class="actions">
@@ -1599,6 +1603,10 @@
<ContentTemplate> <ContentTemplate>
<asp:LinkButton ID="LnkHistorialComprasPagadasPDF" runat="server" data-toggle="tooltip" Title="PDF"> <i class="fa fa-file-pdf-o" style="margin-right: 10px; font-size:15px; font-weight:bold; color:dimgray;"></i> </asp:LinkButton> <asp:LinkButton ID="LnkHistorialComprasPagadasPDF" runat="server" data-toggle="tooltip" Title="PDF"> <i class="fa fa-file-pdf-o" style="margin-right: 10px; font-size:15px; font-weight:bold; color:dimgray;"></i> </asp:LinkButton>
<asp:LinkButton ID="LnkHistorialComprasPagadasExcel" runat="server" data-toggle="tooltip" Title="Excel"><i class="fa fa-file-excel-o" style="margin-right: 10px; font-size:15px; font-weight:bold; color:dimgray;"></i> </asp:LinkButton> <asp:LinkButton ID="LnkHistorialComprasPagadasExcel" runat="server" data-toggle="tooltip" Title="Excel"><i class="fa fa-file-excel-o" style="margin-right: 10px; font-size:15px; font-weight:bold; color:dimgray;"></i> </asp:LinkButton>
<input type="text" id="TxtBusqueda3" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda3','{0}')", GvCxPHistorial.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda3','{0}')", GvCxPHistorial.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
</ContentTemplate> </ContentTemplate>
<Triggers> <Triggers>
<asp:PostBackTrigger ControlID="LnkHistorialComprasPagadasPDF" /> <asp:PostBackTrigger ControlID="LnkHistorialComprasPagadasPDF" />
@@ -1611,8 +1619,7 @@
</div> </div>
<div class="portlet-body "> <div class="portlet-body ">
<div class="row" style="margin-right: 10px;" align="right"> <div class="row" style="margin-right: 10px;" align="right">
<input type="text" id="TxtBusqueda3" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda3','{0}')", GvCxPHistorial.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda3','{0}')", GvCxPHistorial.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
</div> </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"> <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> <Columns>
@@ -1807,7 +1814,7 @@
<Columns> <Columns>
<asp:TemplateField ItemStyle-Width="100px" HeaderText="NC/Anticipo"> <asp:TemplateField ItemStyle-Width="100px" HeaderText="NC/Anticipo">
<ItemTemplate> <ItemTemplate>
<asp:HyperLink ID="HplFactura" runat="server" CssClass="Texto" Text='<%# Eval("SerieFolio")%>' NavigateUrl='<%# If(Eval("CveCompra").ToString <> "0", Eval("CveCompra", "/Compras/Compras.aspx?CveCompra={0}"), if(Eval("CveIE").tostring <>"0",Eval("CveIE", "/Bancos/IE.aspx?CveIE={0}"),""))%>'></asp:HyperLink> <asp:HyperLink ID="HplFactura" runat="server" CssClass="Texto" Text='<%# Eval("SerieFolio")%>' NavigateUrl='<%# If(Eval("CveCompra").ToString <> "0", Eval("CveCompra", "/Compras/Compras.aspx?CveCompra={0}"), If(Eval("CveIE").ToString <> "0", Eval("CveIE", "/Bancos/IE.aspx?CveIE={0}"), ""))%>'></asp:HyperLink>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Fecha"> <asp:TemplateField HeaderText="Fecha">

5101
Empresas/1/Formatos/Factura.rdlc
View File

File diff suppressed because it is too large Load Diff

2
Empresas/13/Formatos/Factura.rdlc
View File

@@ -3383,7 +3383,7 @@
<Width>20.2229cm</Width> <Width>20.2229cm</Width>
<ZIndex>47</ZIndex> <ZIndex>47</ZIndex>
<Visibility> <Visibility>
<Hidden>= iif(IsNothing(Parameters!TieneCartaPorte), True, iif(Parameters!TieneCartaPorte.Value , True, False))</Hidden> <Hidden>= Not iif(IsNothing(Parameters!TieneCartaPorte), True, iif(Parameters!TieneCartaPorte.Value , True, False))</Hidden>
</Visibility> </Visibility>
<Style> <Style>
<Border> <Border>

6232
Empresas/178/Formatos/Factura.rdlc Normal file
View File

File diff suppressed because it is too large Load Diff