AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

concepto,Turno

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2023-02-13 05:50:59 -07:00
parent 963387aa8c
commit fab3e90b57
6 changed files with 194 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
App_Code/ClsNominas.vb
View File

@@ -1,5 +1,6 @@
Imports System.Data
Imports System.Data.SqlClient
Imports ADSNetLibrary.SIGAPI.Models
Imports Extensiones
Imports HigLabo
@@ -1356,7 +1357,8 @@ Public Class ClsNominas
Public Function AddConcepto(Codigo As String, Concepto As String, Tipo As String, Formula As String, Sistema As Boolean, Estado As Boolean, CveConceptoPadre As Integer, CveUsuario As Integer, CveEmpresa As Integer,
EsRetencion As Boolean, CveClasificacion As Integer, IdCtaContable As Integer, CveTipoGasto As Integer, TipoCalculo As Boolean, CveConceptoContable As Integer,
AplicaFiniquito As Integer, AutomaticoGlobal As Integer, Especie As Integer, Imprimir As Integer, CveSATConcepto As Integer) As Integer
AplicaFiniquito As Integer, AutomaticoGlobal As Integer, Especie As Integer, Imprimir As Integer, CveSATConcepto As Integer,
ctaImporteNegativoProv As Integer, contabiliza As Integer, CargoOAbono As Integer, cveConceptoContableB As Integer, IdCtaContableB As Integer, CveCuentaB As Integer) As Integer
Dim Retorno As Integer = -1
DataAdapter("PA_Nom_ConceptosAdd")
@@ -1383,6 +1385,14 @@ Public Class ClsNominas
.Add("Especie", SqlDbType.Bit).Value = Especie
.Add("Imprimir", SqlDbType.Bit).Value = Imprimir
.Add("CveSATConcepto", SqlDbType.Int).Value = CveSATConcepto
.Add("CtaImporteNegativoProv", SqlDbType.Int).Value = ctaImporteNegativoProv
.Add("Contabiliza", SqlDbType.Int).Value = contabiliza
.Add("CargoOAbono", SqlDbType.Int).Value = CargoOAbono
.Add("CveConceptoContableB", SqlDbType.Int).Value = cveConceptoContableB
.Add("IdCtaContableB", SqlDbType.Int).Value = IdCtaContableB
.Add("CveCuentaB", SqlDbType.Int).Value = CveCuentaB
End With
Try
@@ -1407,7 +1417,8 @@ Public Class ClsNominas
Public Function UpdateConcepto(Codigo As String, Concepto As String, Tipo As String, Formula As String, Sistema As Boolean, Estado As Boolean, CveConceptoPadre As Integer, CveConcepto As Integer,
EsRetencion As Boolean, CveClasificacion As Integer, IdCtaContable As Integer, CveTipoGasto As Integer, TipoCalculo As Boolean, CveConceptoContable As Integer,
AplicaFiniquito As Integer, AutomaticoGlobal As Integer, Especie As Integer, Imprimir As Integer, CveSATConcepto As Integer, CveEmpresa As Integer) As Boolean
AplicaFiniquito As Integer, AutomaticoGlobal As Integer, Especie As Integer, Imprimir As Integer, CveSATConcepto As Integer, CveEmpresa As Integer,
ctaImporteNegativoProv As Integer, contabiliza As Integer, CargoOAbono As Integer, cveConceptoContableB As Integer, IdCtaContableB As Integer, CveCuentaB As Integer) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_Nom_ConceptosUpdate")
@@ -1433,6 +1444,13 @@ Public Class ClsNominas
.Add("Imprimir", SqlDbType.Bit).Value = Imprimir
.Add("CveSATConcepto", SqlDbType.Int).Value = CveSATConcepto
.Add("CveEmpresa", SqlDbType.Int).Value = CveEmpresa
.Add("CtaImporteNegativoProv", SqlDbType.Int).Value = ctaImporteNegativoProv
.Add("Contabiliza", SqlDbType.Int).Value = contabiliza
.Add("CargoOAbono", SqlDbType.Int).Value = CargoOAbono
.Add("CveConceptoContableB", SqlDbType.Int).Value = cveConceptoContableB
.Add("IdCtaContableB", SqlDbType.Int).Value = IdCtaContableB
.Add("CveCuentaB", SqlDbType.Int).Value = CveCuentaB
End With
Try

21
App_Code/ClsRH.vb
View File

@@ -3520,9 +3520,12 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
#End Region
#Region "ClsRHTurnos"
Public Function GetTurnos() As Boolean
Public Function GetTurnos(Optional CveEmpresa As Integer = -1) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_RH_TurnoGet")
With SqlAdapter.SelectCommand.Parameters
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
End With
Try
SqlAdapter.Fill(Data)
Retorno = True
@@ -3533,7 +3536,8 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
Return Retorno
End Function
Public Function AddTurno(Turno As String, HorarioDe As String, HorarioA As String, CveUsuario As Integer, CveEmpresa As Integer, CveChecadorHorario As Integer,
ToleranciaERetardo As Integer, ToleranciaEFalta As Integer, ToleranciaSRetardo As Integer, ToleranciaSFalta As Integer) As Boolean
ToleranciaERetardo As Integer, ToleranciaEFalta As Integer, ToleranciaSRetardo As Integer, ToleranciaSFalta As Integer,
Comida As Integer, ComidaDe As String, ComidaA As String) As Boolean
Dim Retorno As Boolean = False
@@ -3543,6 +3547,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
.Add("@Turno", SqlDbType.VarChar).Value = Turno
.Add("@HorarioDe", SqlDbType.Time).Value = HorarioDe
.Add("@HorarioA", SqlDbType.Time).Value = HorarioA
.Add("@Comida", SqlDbType.Int).Value = Comida
.Add("@ComidaDe", SqlDbType.Time).Value = ComidaDe
.Add("@ComidaA", SqlDbType.Time).Value = ComidaA
.Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
.Add("@CveChecadorHorario", SqlDbType.Int).Value = CveChecadorHorario
@@ -3568,7 +3577,8 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
Return Retorno
End Function
Public Function UpdateTurno(Turno As String, HorarioDe As String, HorarioA As String, Estatus As Boolean, CveTurno As Integer, CveUsuario As Integer, CveChecadorHorario As Integer,
ToleranciaERetardo As Integer, ToleranciaEFalta As Integer, ToleranciaSRetardo As Integer, ToleranciaSFalta As Integer) As Boolean
ToleranciaERetardo As Integer, ToleranciaEFalta As Integer, ToleranciaSRetardo As Integer, ToleranciaSFalta As Integer,
Comida As Integer, ComidaDe As String, ComidaA As String) As Boolean
Dim Retorno As Boolean = False
@@ -3578,6 +3588,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
.Add("@Turno", SqlDbType.VarChar).Value = Turno
.Add("@HorarioDe", SqlDbType.Time).Value = HorarioDe
.Add("@HorarioA", SqlDbType.Time).Value = HorarioA
.Add("@Comida", SqlDbType.Int).Value = Comida
.Add("@ComidaDe", SqlDbType.Time).Value = ComidaDe
.Add("@ComidaA", SqlDbType.Time).Value = ComidaA
.Add("@Estatus", SqlDbType.Bit).Value = Estatus
.Add("@CveTurno", SqlDbType.Int).Value = CveTurno
.Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario

137
Nomina/ConceptoNomina.aspx
View File

@@ -171,20 +171,20 @@
<div class="row">
<div class="col-md-6">
<div class="form-group form-md-line-input form-md-floating-label input-iconright">
<div class="">
<asp:Label runat="server" Text="Concepto padre" AssociatedControlID="DdlConceptoPadre"></asp:Label>
<asp:DropDownList ID="DdlConceptoPadre" runat="server" AppendDataBoundItems="True" DataTextField="CodigoConcepto" DataValueField="CveConcepto" Class="form-control select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
</div>
</div>
<div class="col-md-6">
<div class="form-group form-md-line-input form-md-floating-label input-iconright">
<asp:Label runat="server" Text="Concepto contable" AssociatedControlID="DdlConceptoContable"></asp:Label>
<asp:DropDownList ID="DdlConceptoContable" runat="server" AppendDataBoundItems="True" DataTextField="ConceptoContable" DataValueField="CveConceptoContable" Class="form-control select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
<div class="">
<asp:Label runat="server" Text="Concepto SAT" AssociatedControlID="DdlConceptoSAT"></asp:Label>
<asp:DropDownList ID="DdlConceptoSAT" runat="server" AppendDataBoundItems="True" DataTextField="NombreClave" DataValueField="CveSATConcepto" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
</div>
</div>
</div>
<div class="row">
<div class="row " style="display: none">
<div class="col-md-6">
<div class="form-group form-md-line-input form-md-floating-label input-iconright">
<asp:Label runat="server" Text="Clasificación" AssociatedControlID="DdlClasificacion"></asp:Label>
@@ -199,84 +199,83 @@
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group form-md-line-input form-md-floating-label input-iconright">
<asp:Label runat="server" Text="Concepto SAT" AssociatedControlID="DdlConceptoSAT"></asp:Label>
<asp:DropDownList ID="DdlConceptoSAT" runat="server" AppendDataBoundItems="True" DataTextField="NombreClave" DataValueField="CveSATConcepto" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
</div>
</div>
</div>
</div>
</div>
<div class="portlet smmallpadding light bordered" id="Div1" runat="server">
<div class="portlet-title">
<div class="caption uppercase " style="position: relative;">
<i class="fa fa-info-circle font-yellow-gold"></i>
<span class="caption-subject font-yellow-gold bold uppercase">Provisión </span>
</div>
<div class="actions">
<div class="btn-group">
</div>
</div>
</div>
<div class="portlet-body rowpadding">
<div class="row">
<div class="col-md-6">
<label class=" " style="margin-top: 12px;margin-bottom: 12px;" >Contabiliza:</label><br />
<asp:CheckBox ID="ChkContabiliza" CssClass="chksino" Text=" " runat="server" />
</div>
<div class="col-md-6">
<div class="form-group form-md-line-input form-md-floating-label input-iconright">
<asp:Label runat="server" Text="Tipo Provisión" AssociatedControlID="DdlTipoProvision"></asp:Label>
<asp:DropDownList ID="DdlTipoProvision" runat="server" AppendDataBoundItems="True" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar">
<asp:ListItem Value ="1" Text="Normal" />
<asp:ListItem Value ="2" Text="Diferente Cta. con valor negativo" />
</asp:DropDownList>
<asp:UpdatePanel ID="Up" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<div class="portlet smmallpadding light bordered" id="Div1" runat="server">
<div class="portlet-title">
<div class="caption uppercase " style="position: relative;">
<i class="fa fa-info-circle font-yellow-gold"></i>
<span class="caption-subject font-yellow-gold bold uppercase">Provisión del concepto </span>
</div>
<div class="actions">
<label class=" " style="margin-top: 6px; margin-bottom: 6px;">Contabiliza:</label>
<div class="btn-group">
<asp:CheckBox ID="ChkContabiliza" AutoPostBack="true" CssClass="chksino" Text=" " runat="server" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group form-md-line-input form-md-floating-label input-iconright">
<asp:Label runat="server" Text="Cuenta contable" AssociatedControlID="DdlCtaContable"></asp:Label>
<asp:DropDownList ID="DdlCtaContable" runat="server" AppendDataBoundItems="True" DataTextField="CtaCodigo" DataValueField="CveCuenta" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
<asp:Panel class="portlet-body rowpadding" runat="server" ID="DivCtasProvision">
<div class="row">
<div class="col-md-6">
<div class="">
<asp:Label runat="server" Text="Concepto contable" AssociatedControlID="DdlConceptoContable"></asp:Label>
<asp:DropDownList ID="DdlConceptoContable" runat="server" AppendDataBoundItems="True" DataTextField="ConceptoContable" DataValueField="CveConceptoContable" Class="form-control select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
</div>
</div>
<div class="col-md-6">
<div class="">
<asp:Label runat="server" Text="Cuenta contable" AssociatedControlID="DdlCtaContable"></asp:Label>
<asp:DropDownList ID="DdlCtaContable" runat="server" AppendDataBoundItems="True" DataTextField="CtaCodigo" DataValueField="CveCuenta" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group form-md-line-input form-md-floating-label input-iconright">
<asp:Label runat="server" Text="Cargo ó Abono" AssociatedControlID="ddlCargooAbono"></asp:Label>
<asp:DropDownList ID="ddlCargooAbono" runat="server" AppendDataBoundItems="True" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar">
<asp:ListItem Value ="0" Text="Cargo" />
<asp:ListItem Value ="1" Text="Abono" />
</asp:DropDownList>
<div class="row">
<div class="col-md-6">
<div class="">
<asp:Label runat="server" Text="Cargo ó Abono" AssociatedControlID="ddlCargooAbono"></asp:Label>
<asp:DropDownList ID="ddlCargooAbono" runat="server" AppendDataBoundItems="True" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar">
<asp:ListItem Value="0" Text="Cargo" />
<asp:ListItem Value="1" Text="Abono" />
</asp:DropDownList>
</div>
</div>
<div class="col-md-6">
<label class=" " style="margin-top: 6px; margin-bottom: 6px;">Cuenta contable distinta en negativos:</label>
<asp:CheckBox ID="chkCtaImporteNegativoProv" AutoPostBack="true" CssClass="chksino" Text=" " runat="server" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group form-md-line-input form-md-floating-label input-iconright">
<asp:Label runat="server" Text="Cuenta contable B" AssociatedControlID="DdlCtaContableB"></asp:Label>
<asp:DropDownList ID="DdlCtaContableB" runat="server" AppendDataBoundItems="True" DataTextField="CtaCodigo" DataValueField="CveCuenta" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
</div>
</div>
<div class="col-md-6">
<asp:Panel class="row" runat="server" ID="Divctasnegativas">
<div class="col-md-6">
<div class="">
<asp:Label runat="server" Text="Concepto contable" AssociatedControlID="DdlConceptoContableB"></asp:Label>
<asp:DropDownList ID="DdlConceptoContableB" runat="server" AppendDataBoundItems="True" DataTextField="ConceptoContable" DataValueField="CveConceptoContable" Class="form-control select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
</div>
</div>
<div class="col-md-6">
<div class="">
<asp:Label runat="server" Text="Cuenta contable B" AssociatedControlID="DdlCtaContableB"></asp:Label>
<asp:DropDownList ID="DdlCtaContableB" runat="server" AppendDataBoundItems="True" DataTextField="CtaCodigo" DataValueField="CveCuenta" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
</div>
</div>
<%--<div class="col-md-6">
<div class="form-group form-md-line-input form-md-floating-label input-iconright">
<asp:Label runat="server" Text="Cargo ó Abono" AssociatedControlID="ddlCargooAbonoB"></asp:Label>
<asp:DropDownList ID="ddlCargooAbonoB" runat="server" AppendDataBoundItems="True" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar">
<asp:ListItem Value ="0" Text="Cargo" />
<asp:ListItem Value ="1" Text="Abono" />
<asp:ListItem Value="0" Text="Cargo" />
<asp:ListItem Value="1" Text="Abono" />
</asp:DropDownList>
</div>
</div>
</div>--%>
</asp:Panel>
</asp:Panel>
</div>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</div>
<div class="col-md-5">

40
Nomina/ConceptoNomina.aspx.cs
View File

@@ -1,5 +1,6 @@
using Extensiones;
using System;
using System.Activities.Expressions;
using System.Collections.Generic;
using System.Data;
using System.Linq;
@@ -75,6 +76,8 @@ public partial class Nomina_CatConcepto : ClsPaginas
tree_Tables();
InicializaDatos();
}
DivCtasProvision.Visible = ChkContabiliza.Checked;
Divctasnegativas.Visible = chkCtaImporteNegativoProv.Checked;
}
#region Arboles conceptos
@@ -226,6 +229,11 @@ public partial class Nomina_CatConcepto : ClsPaginas
DdlConceptoContable.DataBind();
DdlConceptoContable.Items.Insert(0, new ListItem("Seleccione", "-1"));
DdlConceptoContable.SelectedValueExist("-1");
DdlConceptoContableB.DataSource = get_GlobalDTContaConceptosContables(-1);
DdlConceptoContableB.DataBind();
DdlConceptoContableB.Items.Insert(0, new ListItem("Seleccione", "-1"));
DdlConceptoContableB.SelectedValueExist("-1");
}
protected void CargaClasificacion()
{
@@ -260,6 +268,7 @@ public partial class Nomina_CatConcepto : ClsPaginas
if (UsuarioActual.Empresa.TipoContabilidad == 2)
{
DdlCtaContable.DataValueField = "Id";
DdlCtaContableB.DataValueField = "Id";
using (ClsContPAQi ObjConta = new ClsContPAQi(UsuarioActual.Empresa))
{
@@ -267,11 +276,15 @@ public partial class Nomina_CatConcepto : ClsPaginas
{
DdlCtaContable.DataSource = ObjConta.DtResultados;
DdlCtaContable.DataBind();
DdlCtaContableB.DataSource = ObjConta.DtResultados;
DdlCtaContableB.DataBind();
}
}
DdlCtaContable.Items.Insert(0, new ListItem("Seleccione", "-1"));
DdlCtaContable.SelectedValueExist("-1");
DdlCtaContableB.Items.Insert(0, new ListItem("Seleccione", "-1"));
DdlCtaContableB.SelectedValueExist("-1");
}
else
{
@@ -331,6 +344,15 @@ public partial class Nomina_CatConcepto : ClsPaginas
int Especie = ChkEspecie.Checked ? 1 : 0;
int Imprimir = ChkImprimir.Checked ? 1 : 0;
int CveSATConcepto = DdlConceptoSAT.SelectedValue.ToEntero();
int ctaImporteNegativoProv = (chkCtaImporteNegativoProv.Checked ? 1 : 0);
int contabiliza = (ChkContabiliza.Checked ? 1 : 0);
int CargoOAbono = ddlCargooAbono.SelectedValue.ToEntero();
int cveConceptoContableB = DdlConceptoContableB.SelectedValue.ToEntero();
int IdCtaContableB = (DdlCtaContableB.DataValueField == "Id" ? DdlCtaContableB.SelectedValue.ToEntero() : 0);
int CveCuentaB = (DdlCtaContableB.DataValueField == "Id" ? 0 : DdlCtaContableB.SelectedValue.ToEntero());
ClsNominas ObjNomina = new ClsNominas();
ObjNomina.IniciaTransacSQL();
@@ -338,7 +360,9 @@ public partial class Nomina_CatConcepto : ClsPaginas
if (EsEditar)
{
TieneError = !ObjNomina.UpdateConcepto(codigo, concepto, tipo, formula, sistema, estado, CveConceptoPadre, CveConcepto, retencion, CveClasificacion, IdCtaContable, CveTipoGasto, tipoCalculo, CveConceptoContable, AplicaFiniquito, AutomaticoGlobal, Especie, Imprimir, CveSATConcepto, UsuarioActual.CveEmpresa);
TieneError = !ObjNomina.UpdateConcepto(codigo, concepto, tipo, formula, sistema, estado, CveConceptoPadre, CveConcepto, retencion, CveClasificacion,
IdCtaContable, CveTipoGasto, tipoCalculo, CveConceptoContable, AplicaFiniquito, AutomaticoGlobal, Especie, Imprimir, CveSATConcepto,
UsuarioActual.CveEmpresa, ctaImporteNegativoProv, contabiliza, CargoOAbono, cveConceptoContableB , IdCtaContableB , CveCuentaB);
if (!TieneError)
{
@@ -368,7 +392,9 @@ public partial class Nomina_CatConcepto : ClsPaginas
}
else
{
CveConcepto = ObjNomina.AddConcepto(codigo, concepto, tipo, formula, sistema, estado, CveConceptoPadre, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, retencion, CveClasificacion, IdCtaContable, CveTipoGasto, tipoCalculo, CveConceptoContable, AplicaFiniquito, AutomaticoGlobal, Especie, Imprimir, CveSATConcepto);
CveConcepto = ObjNomina.AddConcepto(codigo, concepto, tipo, formula, sistema, estado, CveConceptoPadre, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa,
retencion, CveClasificacion, IdCtaContable, CveTipoGasto, tipoCalculo, CveConceptoContable, AplicaFiniquito, AutomaticoGlobal, Especie, Imprimir,
CveSATConcepto, ctaImporteNegativoProv, contabiliza, CargoOAbono, cveConceptoContableB, IdCtaContableB, CveCuentaB);
@@ -460,19 +486,21 @@ public partial class Nomina_CatConcepto : ClsPaginas
if (drow["TipoCalculo"].Equals("True")) ChkTipoCalculo.Checked = true;
DdlConceptoPadre.SelectedValueExist(drow["CveConceptoPadre"]);
DdlConceptoContable.SelectedValueExist(drow["CveConceptoContable"]);
DdlConceptoContableB.SelectedValueExist(drow["CveConceptoContableB"]);
ChkEstado.Checked = drow["Estado"].Equals("Activo");
ChkSistema.Checked = drow["Sistema"].Equals("Sí");
ChkAutomaticoLiquidacion.Checked = drow["AplicaFiniquito"].ToString().ToUpper().Contiene(new string[] { "1", "TRUE" });
ChkContabiliza.Checked = drow["Contabiliza"].ToString().ToUpper().Contiene(new string[] { "1", "TRUE" });
chkCtaImporteNegativoProv.Checked = drow["CtaImporteNegativoProv"].ToString().ToUpper().Contiene(new string[] { "1", "TRUE" });
ChkAutomaticoGlobal.Checked = drow["AutomaticoGlobal"].ToString().ToUpper().Contiene(new string[] { "1", "TRUE" });
ChkEspecie.Checked = drow["Especie"].ToString().ToUpper().Contiene(new string[] { "1", "TRUE" });
ChkImprimir.Checked = drow["Imprimir"].ToString().ToUpper().Contiene(new string[] { "1", "TRUE" });
DdlClasificacion.SelectedValueExist(drow["CveClasificacion"]);
DdlTipoProvision.SelectedValueExist(drow["TipoProvision"]);
//DdlTipoProvision.SelectedValueExist(drow["TipoProvision"]);
ddlCargooAbono.SelectedValueExist(drow["CargoOAbono"]);
ddlCargooAbonoB.SelectedValueExist(drow["CargoOAbonoB"]);
//ddlCargooAbonoB.SelectedValueExist(drow["CargoOAbonoB"]);
DdlTipoGasto.SelectedValueExist(drow["CveTipoGasto"]);
//DdlCtaContable.SelectedValueExist(drow["CveCuenta"]);
if (DdlCtaContable.DataValueField == "Id")
@@ -491,6 +519,10 @@ public partial class Nomina_CatConcepto : ClsPaginas
{
DdlCtaContableB.SelectedValueExist(drow["CveCuentaB"]);
}
if (ChkContabiliza.Checked && (DdlCtaContable.SelectedValue.ToEntero() <= 0 || (chkCtaImporteNegativoProv.Checked && DdlCtaContableB.SelectedValue.ToEntero() <= 0)))
{
Alert("el concepto esta marcado como contabilizable pero no estan asignadas correctamente las cuentas.", ModExtensiones.TipoMensaje.MsgAdvertencia);
}
//if (UsuarioActual.Empresa.TipoContabilidad == 1)
//{
//}

27
RH/CatTurno.aspx
View File

@@ -47,7 +47,7 @@
</table>
<asp:GridView ID="GvTurno" runat="server" GridLines="None" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" CellSpacing="0" Width="100%" AutoGenerateColumns="False"
EmptyDataText="No se encontraron registros" ToolTip="Listado de Turnos" data-tableheader="#thheader"
DataKeyNames="CveTurno,Turno,CveChecadorHorario,HorarioDe,HorarioA,Estatus,FechaIng,CveUsuario,CveEmpresa,Usuario,ChecadorHorario,ToleranciaERetardo,ToleranciaEFalta,ToleranciaEFalta2,ToleranciaSRetardo,ToleranciaSFalta">
DataKeyNames="CveTurno,Turno,CveChecadorHorario,HorarioDe,HorarioA,Comida,ComidaDe,ComidaA,Estatus,FechaIng,CveUsuario,CveEmpresa,Usuario,ChecadorHorario,ToleranciaERetardo,ToleranciaEFalta,ToleranciaEFalta2,ToleranciaSRetardo,ToleranciaSFalta">
<Columns>
<asp:BoundField DataField="Turno" HeaderText="Turno" ItemStyle-HorizontalAlign="Left" />
<%--<asp:BoundField DataField="ChecadorHorario" HeaderText="Checador Horario" ItemStyle-HorizontalAlign="Left" />--%>
@@ -125,6 +125,31 @@
<ajax:ValidatorCalloutExtender ID="VCOHorarioA2" runat="server" HighlightCssClass="vco" TargetControlID="MEVHorarioA"></ajax:ValidatorCalloutExtender>
<label for="<%= TxtHorarioDe.ClientID.ToString()%>">Hora de Salida:</label>
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:CheckBox ID="chkComida" runat="server" CssClass="form-control" />
<label for="<%= chkComida.ClientID.ToString()%>">Con Horario de comida:</label>
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox ID="TxtComidade" runat="server" CausesValidation="true" CssClass="form-control" MaxLength="10" Width="104px"></asp:TextBox>
<asp:RequiredFieldValidator ID="RFVComidade" runat="server" ControlToValidate="TxtComidade" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Hr. Entrada''</b> es necesario, por favor ingréselo." ValidationGroup="GrpObligatorio"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VCOComidade1" runat="server" HighlightCssClass="vco" TargetControlID="RFVComidade" Width="300px"></ajax:ValidatorCalloutExtender>
<ajax:MaskedEditExtender ID="MEEComidade" runat="server" TargetControlID="TxtComidade" Mask="99:99:99" MaskType="Time" InputDirection="RightToLeft"></ajax:MaskedEditExtender>
<ajax:MaskedEditValidator ID="MEVComidade" runat="server" ControlExtender="MEEComidade" ControlToValidate="TxtComidade" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Hr. Entrada''</b> no tiene el formato correcto, por favor corrija (Formato 24 Horas)." IsValidEmpty="true" MaximumValue="23:59:59" MinimumValue="00:00:00" ToolTip="Formato 24 Horas" ValidationGroup="GrpObligatorio"></ajax:MaskedEditValidator>
<ajax:ValidatorCalloutExtender ID="VCOComidade2" runat="server" HighlightCssClass="vco" TargetControlID="MEVComidade"></ajax:ValidatorCalloutExtender>
<label for="<%= TxtComidade.ClientID.ToString()%>">Hora de Comida Entrada:</label>
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox ID="TxtComidaA" runat="server" CausesValidation="true" CssClass="form-control" MaxLength="10" Width="104px"></asp:TextBox>
<asp:RequiredFieldValidator ID="RFVComidaA" runat="server" ControlToValidate="TxtComidaA" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Hr. Entrada''</b> es necesario, por favor ingréselo." ValidationGroup="GrpObligatorio"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VCOComidaA1" runat="server" HighlightCssClass="vco" TargetControlID="RFVComidaA" Width="300px"></ajax:ValidatorCalloutExtender>
<ajax:MaskedEditExtender ID="MEEComidaA" runat="server" TargetControlID="TxtComidaA" Mask="99:99:99" MaskType="Time" InputDirection="RightToLeft"></ajax:MaskedEditExtender>
<ajax:MaskedEditValidator ID="MEVComidaA" runat="server" ControlExtender="MEEComidaA" ControlToValidate="TxtComidaA" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Hr. Entrada''</b> no tiene el formato correcto, por favor corrija (Formato 24 Horas)." IsValidEmpty="true" MaximumValue="23:59:59" MinimumValue="00:00:00" ToolTip="Formato 24 Horas" ValidationGroup="GrpObligatorio"></ajax:MaskedEditValidator>
<ajax:ValidatorCalloutExtender ID="VCOComidaA2" runat="server" HighlightCssClass="vco" TargetControlID="MEVComidaA"></ajax:ValidatorCalloutExtender>
<label for="<%= TxtComidaA.ClientID.ToString()%>">Hora de Comida Salida:</label>
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox ID="TxtRetardo" runat="server" CausesValidation="true" CssClass="form-control" ValidationGroup="GrpObligatorio"></asp:TextBox>
<asp:Label AssociatedControlID="TxtRetardo" runat="server" Text="Tolerancia Entrada"></asp:Label>

45
RH/CatTurno.aspx.vb
View File

@@ -27,7 +27,7 @@ Partial Class RH_CatTurno
End Sub
Private Sub CargaDatos()
Dim ObjRH As New ClsRH()
If ObjRH.GetTurnos Then
If ObjRH.GetTurnos(UsuarioActual.CveEmpresa) Then
GvTurno.DataSource = ObjRH.DtResultados.FiltraParametros(" CveEmpresa =" & UsuarioActual.CveEmpresa)
GvTurno.DataBind()
End If
@@ -36,26 +36,28 @@ Partial Class RH_CatTurno
End Sub
Private Sub BtnAgregarTurno_Click(sender As Object, e As EventArgs) Handles BtnAgregarTurno.Click
Dim ObjRH As New ClsRH
Dim Estatus As Boolean = False
If ChkEstatus.Checked Then Estatus = True
If HdnModalidad.Value = "A" Then
If ObjRH.AddTurno(TxtTurno.Text, TxtHorarioDe.Text, TxtHorarioA.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, DdlChecadorHorario.SelectedValue.ToEntero(),
TxtRetardo.Text.ToEntero(), TxtFretardo.Text.ToEntero() - TxtRetardo.Text.ToEntero(), 0, TxtFsalida.Text.ToEntero()) Then
CargaDatos()
CargaGlobalDTTurno()
Alert("Agregado Correctamente.", TipoMensaje.MsgInformacion)
Using ObjRH As New ClsRH
Dim Estatus As Boolean = False
Dim comida As Integer = If(chkComida.Checked, 1, 0)
If ChkEstatus.Checked Then Estatus = True
If HdnModalidad.Value = "A" Then
If ObjRH.AddTurno(TxtTurno.Text, TxtHorarioDe.Text, TxtHorarioA.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, DdlChecadorHorario.SelectedValue.ToEntero(),
TxtRetardo.Text.ToEntero(), TxtFretardo.Text.ToEntero() - TxtRetardo.Text.ToEntero(), 0, TxtFsalida.Text.ToEntero(), comida, TxtComidade.Text, TxtComidaA.Text) Then
CargaDatos()
CargaGlobalDTTurno()
Alert("Agregado Correctamente.", TipoMensaje.MsgInformacion)
End If
ElseIf HdnModalidad.Value = "U" Then
If ObjRH.UpdateTurno(TxtTurno.Text, TxtHorarioDe.Text, TxtHorarioA.Text, Estatus, HdnID.Value.ToEntero(), UsuarioActual.CveUsuario, DdlChecadorHorario.SelectedValue.ToEntero(),
TxtRetardo.Text.ToEntero(), TxtFretardo.Text.ToEntero() - TxtRetardo.Text.ToEntero(), 0, TxtFsalida.Text.ToEntero(), comida, TxtComidade.Text, TxtComidaA.Text) Then
CargaDatos()
CargaGlobalDTTurno()
Alert("Actualizado Correctamente.", TipoMensaje.MsgInformacion)
End If
End If
ElseIf HdnModalidad.Value = "U" Then
If ObjRH.UpdateTurno(TxtTurno.Text, TxtHorarioDe.Text, TxtHorarioA.Text, Estatus, HdnID.Value.ToEntero(), UsuarioActual.CveUsuario, DdlChecadorHorario.SelectedValue.ToEntero(),
TxtRetardo.Text.ToEntero(), TxtFretardo.Text.ToEntero() - TxtRetardo.Text.ToEntero(), 0, TxtFsalida.Text.ToEntero()) Then
CargaDatos()
CargaGlobalDTTurno()
Alert("Actualizado Correctamente.", TipoMensaje.MsgInformacion)
End If
End If
End Using
RegistraScript(String.Format("$('#{0}').modal('hide');", "divAddTurno"))
ObjRH.Dispose()
UpDatos.Update()
End Sub
@@ -75,6 +77,11 @@ Partial Class RH_CatTurno
TxtFretardo.Text = (GvRow.DataKey("ToleranciaEFalta2").ToEntero()).ToString()
TxtFsalida.Text = GvRow.DataKey("ToleranciaSFalta")
ChkEstatus.Checked = CBool(GvRow.DataKey("Estatus"))
chkComida.Checked = (GvRow.DataKey("Comida") = "1")
TxtComidade.Text = GvRow.DataKey("ComidaDe")
TxtComidaA.Text = GvRow.DataKey("ComidaA")
UpAddTurno.Update()
'CargaGlobalDTTurno()