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
2024-09-24 17:51:43 -07:00
parent 6280462890 8a7c15f85b
commit 9df8c6da3a
2 changed files with 174 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ashx/SIGFacturacion.ashx
View File

@@ -13,7 +13,7 @@ Imports Modelos
Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
Private Property CveEmpresaFacturar As Integer = 143 Private Property CveEmpresaFacturar As Integer = 194
Public Sub ProcessRequest(ByVal context As HttpContext) Implements IHttpHandler.ProcessRequest Public Sub ProcessRequest(ByVal context As HttpContext) Implements IHttpHandler.ProcessRequest
context.Response.ContentType = "text/plain" context.Response.ContentType = "text/plain"
@@ -906,7 +906,7 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
' strLineaTMP = Chr(13) & Chr(10) & Day(NowADS()) & "/" & Month(NowADS()) & "/" & Year(NowADS()) & " " & Hour(NowADS()) & ":" & Minuto & ". " & Str & Chr(13) & Chr(10) ' strLineaTMP = Chr(13) & Chr(10) & Day(NowADS()) & "/" & Month(NowADS()) & "/" & Year(NowADS()) & " " & Hour(NowADS()) & ":" & Minuto & ". " & Str & Chr(13) & Chr(10)
strLineaTMP = String.Format("{0}{1}Log: {2}{3}:{4}", Chr(13), Chr(10), Str, ClsPaginas.NowADS().ToShortDateString, ClsPaginas.NowADS().ToShortTimeString) strLineaTMP = String.Format("{0}{1}Log: {2}{3}:{4}", Chr(13), Chr(10), Str, ClsPaginas.NowADS().ToShortDateString, ClsPaginas.NowADS().ToShortTimeString)
Try Try
ArchivoW = New StreamWriter(String.Format("{0}\LogFacturacion.txt", ModExtensiones.DirectorioBaseEmpresas), True, System.Text.Encoding.UTF8) ArchivoW = New StreamWriter(String.Format("{0}\Log\LogFacturacion.txt", AppDomain.CurrentDomain.BaseDirectory), True, System.Text.Encoding.UTF8)
Catch ex As UnauthorizedAccessException Catch ex As UnauthorizedAccessException
'Alert("No hay permisos para guardar en el Log.", Extensiones.TipoMensaje.MsgError) 'Alert("No hay permisos para guardar en el Log.", Extensiones.TipoMensaje.MsgError)
Exit Sub Exit Sub

19
Transportes/RepContratosCalendario.aspx
View File

@@ -341,10 +341,10 @@
<label class="col-md-3 bold text-primary">Folio:</label> <label class="col-md-3 bold text-primary">Folio:</label>
<div class="col-md-2"> <div class="col-md-2">
<asp:TextBox ID="TxtFolio" runat="server" Width="80px" Font-Bold="true" cssclass="textaslabel"></asp:TextBox> <asp:TextBox ID="TxtFolio" runat="server" Width="80px" Font-Bold="true" CssClass="textaslabel"></asp:TextBox>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<asp:HyperLink runat="server" Text="" Target="_blank" id="HypRemision" CssClass="Texto"></asp:HyperLink> <asp:HyperLink runat="server" Text="" Target="_blank" ID="HypRemision" CssClass="Texto"></asp:HyperLink>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<asp:Label runat="server" ID="LblSaldo"></asp:Label> <asp:Label runat="server" ID="LblSaldo"></asp:Label>
@@ -449,8 +449,7 @@
DataTextField="TipoActivoFijo" Class="form-control input-inline" DataTextField="TipoActivoFijo" Class="form-control input-inline"
Width="100%" runat="server" Enabled="true" Width="100%" runat="server" Enabled="true"
AutoPostBack="true" AutoPostBack="true"
OnSelectedIndexChanged="DdlTipoAF_SelectedIndexChanged" OnSelectedIndexChanged="DdlTipoAF_SelectedIndexChanged">
>
</asp:DropDownList> </asp:DropDownList>
</div> </div>
</div> </div>
@@ -539,7 +538,6 @@
<asp:HiddenField runat="server" ID="HdnCveContrato" Value="-1" ClientIDMode="Static" /> <asp:HiddenField runat="server" ID="HdnCveContrato" Value="-1" ClientIDMode="Static" />
<%--<asp:Button runat="server" ID="BtnDdlTipoAF" OnClick="BtnDdlTipoAF_Click" ClientIDMode="Static"></asp:Button>--%> <%--<asp:Button runat="server" ID="BtnDdlTipoAF" OnClick="BtnDdlTipoAF_Click" ClientIDMode="Static"></asp:Button>--%>
</ContentTemplate> </ContentTemplate>
</asp:UpdatePanel> </asp:UpdatePanel>
</div> </div>
@@ -810,7 +808,16 @@
$('#<%=DdlClientes.ClientID%>').val(event.CveCliente); $('#<%=DdlClientes.ClientID%>').val(event.CveCliente);
$('#<%=DdlChofer.ClientID%>').val(event.CvePersonal); $('#<%=DdlChofer.ClientID%>').val(event.CvePersonal);
$('#<%=DdlChofer2.ClientID%>').val(event.CvePersonal2);
if (event.CvePersonal2 > 0) {
$('#<%=chkSegundoChofer.ClientID%>').prop('checked', true);
setTimeout(function () { $('#<%=DdlChofer2.ClientID%>').val(event.CvePersonal2).change(); }, 500);;
;
} else {
$('#<%=chkSegundoChofer.ClientID%>').prop('checked', false);
$('#<%=DdlChofer2.ClientID%>').val(-1);
}
$('#<%=DdlEstatusContrato.ClientID%>').val(event.CveEventoEstatus); $('#<%=DdlEstatusContrato.ClientID%>').val(event.CveEventoEstatus);
$('#<%=TxtDolares.ClientID%>').val(event.Dolares); $('#<%=TxtDolares.ClientID%>').val(event.Dolares);
$('#<%=TxtPesos.ClientID%>').val(event.Pesos); $('#<%=TxtPesos.ClientID%>').val(event.Pesos);