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-01-16 08:07:48 -07:00
parent 1898abc9e7 bede329772
commit 236a5219e7
4 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AF/AF.aspx
View File

@@ -489,6 +489,18 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-4 ">
<label class=" control-label">Cuenta: </label>
</div>
<div class="col-md-7">
<div class="form-group">
<asp:TextBox ID="TxtAgroCuenta" runat="server"></asp:TextBox>
</div>
</div>
</div>
</asp:Panel>
</ContentTemplate>

8
App_Code/ClsAF.vb
View File

@@ -401,7 +401,7 @@ Public Class ClsAF
CveSubProyecto As Integer, Cuenta As Integer, CveEstadoActivoFijo As Integer, IdCtaContDepreciacion As Integer, PorDepreciacion As Double, Observaciones As String, CveCliente As Integer,
CveMovimiento As Integer, CveUsuario As Integer, CveEmpresa As Integer, Optional CveMarca As Integer = -1, Optional CveModelo As Integer = -1, Optional CveGrupo As Integer = -1,
Optional CveAFPadre As Integer = -1, Optional CveDispositivo As Integer = -1, Optional FechaBaja As Date = MinFecha,
Optional Lat As String = "", Optional Longi As String = "") As Integer
Optional Lat As String = "", Optional Longi As String = "", Optional AgroCuenta As String = "") As Integer
Dim Retorno As Integer = -1
@@ -437,6 +437,7 @@ Public Class ClsAF
.Add("@Lat", SqlDbType.VarChar).Value = Lat
.Add("@Long", SqlDbType.VarChar).Value = Longi
.Add("@AgroCuenta", SqlDbType.VarChar).Value = AgroCuenta
.Add("@CveActivoFijo", SqlDbType.Int).Direction = ParameterDirection.Output
.Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue
@@ -455,7 +456,7 @@ Public Class ClsAF
Alert("Capture un SubTipo de Activo Fijo Valido", TipoMensaje.MsgAdvertencia)
Else
Alert("Ya existe un Activo Fijo con el mismo nombre: " & Descripcion & ".", TipoMensaje.MsgAdvertencia)
Alert("Ya existe un Activo Fijo con el mismo nombre: " & Descripcion & ".", TipoMensaje.MsgAdvertencia)
End If
Else
@@ -472,7 +473,7 @@ Public Class ClsAF
CveEstadoActivoFijo As Integer, IdCtaContDepreciacion As Integer, PorDepreciacion As Double, Observaciones As String, CveCliente As Integer,
CveUsuarioModifico As Integer, CveEmpresa As Integer, Optional CveMarca As Integer = -1, Optional CveModelo As Integer = -1, Optional CveGrupo As Integer = -1,
Optional CveAFPadre As Integer = -1, Optional CveDispositivo As Integer = -1, Optional FechaBaja As Date = MinFecha,
Optional Lat As String = "", Optional Longi As String = "") As Boolean
Optional Lat As String = "", Optional Longi As String = "", Optional AgroCuenta As String = "") As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_AF_ActivosFijosUpdate")
@@ -507,6 +508,7 @@ Public Class ClsAF
.Add("@FechaBaja", SqlDbType.Date).Value = FechaBaja
.Add("@Lat", SqlDbType.VarChar).Value = Lat
.Add("@Long", SqlDbType.VarChar).Value = Longi
.Add("@AgroCuenta", SqlDbType.VarChar).Value = AgroCuenta
End With
Try

2
App_Code/ClsNominas.vb
View File

@@ -2624,7 +2624,7 @@ Public Class ClsNominas
Dim retorno As Boolean = False
Try
DTSet = New DataSet()
DataAdapter("PA_Nom_NominaEmpleadosz", CommandType.StoredProcedure)
DataAdapter("PA_Nom_NominaEmpleados", CommandType.StoredProcedure)
With SqlAdapter.SelectCommand.Parameters
.Add("@CveProyecto", SqlDbType.Int).Value = CveProyecto
.Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto

7
Nomina/Nomina.aspx.cs
View File

@@ -492,7 +492,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
CveTipoTrabajador = DdlTipoTrabajador.SelectedValue.ToEntero();
HypPDFSTimbrados.Attributes.Add("onclick", string.Format("GETPDF({0},{1})", -1, FiltCvePeriodo));
cargaDatos();
LtlPeriodoseleccionado.Text = string.Format("{0} ({1} Empleados)", DdlPeriodo.SelectedItem.Text, dtempleados.COUNT("CvePersonal", " CvePersonal >0 "));
int empleados = 0;
if(dtempleados != null && dtempleados.Rows.Count>0)
{
empleados = dtempleados.COUNT("CvePersonal", " CvePersonal >0 ");
}
LtlPeriodoseleccionado.Text = string.Format("{0} ({1} Empleados)", DdlPeriodo.SelectedItem.Text, empleados);
LtlPeriodoseleccionadoASis.Text = LtlPeriodoseleccionado.Text;
}