Merge branch 'master' of http://192.168.10.111:8383/SIG
This commit is contained in:
@@ -2025,6 +2025,8 @@ Public Class ClsContPAQi
|
||||
End With
|
||||
|
||||
Try
|
||||
|
||||
SqlAdapter.SelectCommand.CommandTimeout = 0
|
||||
SqlAdapter.Fill(Data)
|
||||
Retorno = True
|
||||
Catch ex As Exception
|
||||
|
||||
@@ -323,20 +323,7 @@ Public Class ClsNominas
|
||||
End Try
|
||||
Return retorno
|
||||
End Function
|
||||
Public Function GetNominasSinTimbrar() As Boolean
|
||||
Dim retorno As Boolean = False
|
||||
DTSet = New DataSet()
|
||||
DataAdapter("PA_Nom_NominasSinTimbrar", CommandType.StoredProcedure)
|
||||
With SqlAdapter.SelectCommand.Parameters
|
||||
End With
|
||||
Try
|
||||
SqlAdapter.Fill(Data)
|
||||
retorno = True
|
||||
Catch ex As Exception
|
||||
OnError("Ocurrió un error al NominasSinTimbrar.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
|
||||
End Try
|
||||
Return retorno
|
||||
End Function
|
||||
|
||||
Public Function PersonalISRAnual(CvePersonal As Integer, cveEmpresa As Integer, Ejercicio As Integer) As Boolean
|
||||
Dim retorno As Boolean = False
|
||||
DTSet = New DataSet()
|
||||
|
||||
@@ -211,7 +211,7 @@
|
||||
<div class="row">
|
||||
<label class="col-md-2 control-label">
|
||||
<asp:Label ID="LblFolio" runat="server" Text="Número:"></asp:Label></label>
|
||||
<div class="col-md-2">
|
||||
<div class="col-md-4">
|
||||
<asp:TextBox ID="TxtFolio" runat="server" MaxLength="14" class="form-control input-sm"></asp:TextBox>
|
||||
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="TxtFolio" Display="None" ErrorMessage="El campo <b>''Folio''</b> es requerido por la aplicación, por favor ingrese una fecha." ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender2" runat="server" HighlightCssClass="vco" TargetControlID="RequiredFieldValidator1" Width="350px"></ajax:ValidatorCalloutExtender>
|
||||
@@ -229,7 +229,7 @@
|
||||
|
||||
|
||||
</div>
|
||||
<div class="col-md-4"></div>
|
||||
<div class="col-md-2"></div>
|
||||
<label class="col-md-1 control-label text-right">Importe:</label>
|
||||
<div class="col-md-2 input-icon">
|
||||
<i style="margin: 0px;">$</i>
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<label class="col-md-2 control-label">Cuenta:</label>
|
||||
<div class="col-md-5">
|
||||
<div class="col-md-4">
|
||||
<asp:DropDownList ID="DdlCuenta" runat="server" CssClass="form-control input-sm select2me" AppendDataBoundItems="true" AutoPostBack="true" DataTextField="NumCuentaMoneda" DataValueField="CveCuenta" ValidationGroup="GrpGuardar">
|
||||
</asp:DropDownList>
|
||||
<asp:RequiredFieldValidator ID="RFVCuenta" runat="server" ControlToValidate="DdlCuenta" InitialValue="-1" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Cuenta''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
|
||||
@@ -130,12 +130,12 @@
|
||||
<div class="row">
|
||||
<label class="col-md-2 control-label">
|
||||
<asp:Label ID="Label1" runat="server" Text="Número:"></asp:Label></label>
|
||||
<div class="col-md-2">
|
||||
<div class="col-md-4">
|
||||
<asp:TextBox ID="TxtFolio" runat="server" MaxLength="14" CssClass="form-control input-sm"></asp:TextBox>
|
||||
<asp:RequiredFieldValidator ID="RFVFolio" runat="server" ControlToValidate="TxtFolio" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Folio''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender2" runat="server" HighlightCssClass="vco" TargetControlID="RFVFolio" Width="350px"></ajax:ValidatorCalloutExtender>
|
||||
</div>
|
||||
<div class="col-md-4"></div>
|
||||
<div class="col-md-2"></div>
|
||||
<label class="col-md-1 control-label text-right">Importe:</label>
|
||||
<div class="col-md-3 input-icon">
|
||||
<i style="margin: 0px;">$</i>
|
||||
|
||||
@@ -122,12 +122,12 @@
|
||||
<tr>
|
||||
<td>Folio</td>
|
||||
<td>
|
||||
<asp:TextBox ID="TxtFolio" CssClass="form-control input-sm " runat="server" MaxLength="14" Width="80px"></asp:TextBox></td>
|
||||
<asp:TextBox ID="TxtFolio" CssClass="form-control input-sm " runat="server" MaxLength="14" Width="100%"></asp:TextBox></td>
|
||||
</tr>
|
||||
<tr id="trPagueseA">
|
||||
<td>Paguese</td>
|
||||
<td>
|
||||
<asp:TextBox ID="TxtPaguese" CssClass="form-control input-sm " runat="server" Width="200px"></asp:TextBox></td>
|
||||
<asp:TextBox ID="TxtPaguese" CssClass="form-control input-sm " runat="server" Width="100%"></asp:TextBox></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Observaciones:</td>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
BIN
GPS/vssver2.scc
BIN
GPS/vssver2.scc
Binary file not shown.
@@ -92,13 +92,13 @@ Partial Class Inicio
|
||||
End If
|
||||
If UsuarioActual.CveUsuario = 100 Then
|
||||
|
||||
Using objnom As New ClsNominas
|
||||
If objnom.GetNominasSinTimbrar() AndAlso objnom.DtResultados.Rows.Count > 0 Then
|
||||
GVNomPendientesxTimbrar.DataSource = objnom.DtResultados
|
||||
GVNomPendientesxTimbrar.DataBind()
|
||||
RegistraScript("$('#NominasSinTimbrar').modal();", "tikNominasSinTimbrar")
|
||||
End If
|
||||
End Using
|
||||
'Using objnom As New ClsNominas
|
||||
' If objnom.GetNominasSinTimbrar() AndAlso objnom.DtResultados.Rows.Count > 0 Then
|
||||
' GVNomPendientesxTimbrar.DataSource = objnom.DtResultados
|
||||
' GVNomPendientesxTimbrar.DataBind()
|
||||
' RegistraScript("$('#NominasSinTimbrar').modal();", "tikNominasSinTimbrar")
|
||||
' End If
|
||||
'End Using
|
||||
Using objventas As New ClsVentas
|
||||
If objventas.GETVentasPendientesdeTimbrar(UsuarioActual.CveEmpresa) AndAlso objventas.DtResultados.Rows.Count > 0 Then
|
||||
GVVtasPendientesxTimbrarSAT.DataSource = objventas.DtResultados
|
||||
|
||||
@@ -480,6 +480,8 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user