From 2bf98546c032b2166280db04638c59b27b52266c Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Tue, 4 Apr 2023 11:57:58 -0700 Subject: [PATCH] --- App_Code/ClsNominas.vb | 6 ++++-- Nomina/ConceptoNomina.aspx | 21 ++++++++++++++++++++- Nomina/ConceptoNomina.aspx.cs | 11 +++++++++-- Nomina/Nomina.aspx | 2 +- RH/Personal.aspx | 2 +- 5 files changed, 35 insertions(+), 7 deletions(-) diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 248134785..ae1e97b84 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -1377,7 +1377,7 @@ 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, - ctaImporteNegativoProv As Integer, contabiliza As Integer, CargoOAbono As Integer, cveConceptoContableB As Integer, IdCtaContableB As Integer, CveCuentaB As Integer) As Integer + ctaImporteNegativoProv As Integer, contabiliza As Integer, CargoOAbono As Integer, cveConceptoContableB As Integer, IdCtaContableB As Integer, CveCuentaB As Integer, CveConceptoContablePasivo As Integer) As Integer Dim Retorno As Integer = -1 DataAdapter("PA_Nom_ConceptosAdd") @@ -1411,6 +1411,7 @@ Public Class ClsNominas .Add("CveConceptoContableB", SqlDbType.Int).Value = cveConceptoContableB .Add("IdCtaContableB", SqlDbType.Int).Value = IdCtaContableB .Add("CveCuentaB", SqlDbType.Int).Value = CveCuentaB + .Add("CveConceptoContablePasivo", SqlDbType.Int).Value = CveConceptoContablePasivo End With @@ -1437,7 +1438,7 @@ 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, - ctaImporteNegativoProv As Integer, contabiliza As Integer, CargoOAbono As Integer, cveConceptoContableB As Integer, IdCtaContableB As Integer, CveCuentaB As Integer) As Boolean + ctaImporteNegativoProv As Integer, contabiliza As Integer, CargoOAbono As Integer, cveConceptoContableB As Integer, IdCtaContableB As Integer, CveCuentaB As Integer, CveConceptoContablePasivo As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Nom_ConceptosUpdate") @@ -1470,6 +1471,7 @@ Public Class ClsNominas .Add("CveConceptoContableB", SqlDbType.Int).Value = cveConceptoContableB .Add("IdCtaContableB", SqlDbType.Int).Value = IdCtaContableB .Add("CveCuentaB", SqlDbType.Int).Value = CveCuentaB + .Add("CveConceptoContablePasivo", SqlDbType.Int).Value = CveConceptoContablePasivo End With Try diff --git a/Nomina/ConceptoNomina.aspx b/Nomina/ConceptoNomina.aspx index d2db06b9e..7a68835f7 100644 --- a/Nomina/ConceptoNomina.aspx +++ b/Nomina/ConceptoNomina.aspx @@ -223,7 +223,7 @@
- +
@@ -272,6 +272,25 @@
--%> + + +
+
+
+ + +
+
+
+
+ <%-- + + + + --%> +
+
+
diff --git a/Nomina/ConceptoNomina.aspx.cs b/Nomina/ConceptoNomina.aspx.cs index a5dced7e4..4342a5b94 100644 --- a/Nomina/ConceptoNomina.aspx.cs +++ b/Nomina/ConceptoNomina.aspx.cs @@ -234,6 +234,11 @@ public partial class Nomina_CatConcepto : ClsPaginas DdlConceptoContableB.DataBind(); DdlConceptoContableB.Items.Insert(0, new ListItem("Seleccione", "-1")); DdlConceptoContableB.SelectedValueExist("-1"); + + DdlConceptoContablePasivo.DataSource = get_GlobalDTContaConceptosContables(-1); + DdlConceptoContablePasivo.DataBind(); + DdlConceptoContablePasivo.Items.Insert(0, new ListItem("Seleccione", "-1")); + DdlConceptoContablePasivo.SelectedValueExist("-1"); } protected void CargaClasificacion() { @@ -354,6 +359,7 @@ public partial class Nomina_CatConcepto : ClsPaginas int contabiliza = (ChkContabiliza.Checked ? 1 : 0); int CargoOAbono = ddlCargooAbono.SelectedValue.ToEntero(); int cveConceptoContableB = DdlConceptoContableB.SelectedValue.ToEntero(); + int CveConceptoContablePasivo = DdlConceptoContablePasivo.SelectedValue.ToEntero(); int IdCtaContableB = (DdlCtaContableB.DataValueField == "Id" ? DdlCtaContableB.SelectedValue.ToEntero() : 0); int CveCuentaB = (DdlCtaContableB.DataValueField == "Id" ? 0 : DdlCtaContableB.SelectedValue.ToEntero()); @@ -366,7 +372,7 @@ public partial class Nomina_CatConcepto : ClsPaginas { 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); + UsuarioActual.CveEmpresa, ctaImporteNegativoProv, contabiliza, CargoOAbono, cveConceptoContableB , IdCtaContableB , CveCuentaB, CveConceptoContablePasivo); if (!TieneError) { @@ -398,7 +404,7 @@ public partial class Nomina_CatConcepto : ClsPaginas { 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); + CveSATConcepto, ctaImporteNegativoProv, contabiliza, CargoOAbono, cveConceptoContableB, IdCtaContableB, CveCuentaB, CveConceptoContablePasivo); @@ -491,6 +497,7 @@ public partial class Nomina_CatConcepto : ClsPaginas DdlConceptoPadre.SelectedValueExist(drow["CveConceptoPadre"]); DdlConceptoContable.SelectedValueExist(drow["CveConceptoContable"]); DdlConceptoContableB.SelectedValueExist(drow["CveConceptoContableB"]); + DdlConceptoContablePasivo.SelectedValueExist(drow["CveConceptoContablePasivo"]); ChkEstado.Checked = drow["Estado"].Equals("Activo"); ChkSistema.Checked = drow["Sistema"].Equals("Sí"); diff --git a/Nomina/Nomina.aspx b/Nomina/Nomina.aspx index 4a1ef2c08..af41c7ff1 100644 --- a/Nomina/Nomina.aspx +++ b/Nomina/Nomina.aspx @@ -1381,7 +1381,7 @@
-

Moviento permanente

+

Movimiento permanente

diff --git a/RH/Personal.aspx b/RH/Personal.aspx index e5d4b2151..e32b4fe3c 100644 --- a/RH/Personal.aspx +++ b/RH/Personal.aspx @@ -1659,7 +1659,7 @@
-

Moviento permanente

+

Movimiento permanente