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:
Oscar Irigoyen
2023-04-04 19:54:38 -07:00
parent b14603a8b9 8b49c5246a
commit d3a0490814
7 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
App_Code/ClsNominas.vb
View File

@@ -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

4
Bancos/ConciliacionesBancarias.aspx.vb
View File

@@ -638,14 +638,14 @@ Partial Class Bancos_ConciliacionesBancariasaspx
End If
End If
If CveCuenta > 0 Then
If ObjConta.GetMovimientosAuxiliaresCatalogo(CveCuenta, txtFechaI.Text.ToDate, txtFechaF.Text.ToDate, CveMoneda, -1, -1, UsuarioActual.CveEmpresa, "1") Then
If ObjConta.GetMovimientosAuxiliaresCatalogo(CveCuenta, txtFechaI.Text.ToDate, txtFechaF.Text.ToDate, CveMoneda, -1, -1, UsuarioActual.CveEmpresa, "1", -1) Then
If ObjConta.DtResultados.Rows.Count > 1 Then
SaldoFinalContabilidad = ObjConta.DtResultados.Rows(1)("SaldoActual").ToString.ToDouble
End If
End If
End If
If CveCuentaComplementaria > 0 Then
If ObjConta.GetMovimientosAuxiliaresCatalogo(CveCuentaComplementaria, txtFechaI.Text.ToDate, txtFechaF.Text.ToDate, CveMoneda, -1, -1, UsuarioActual.CveEmpresa, "1") Then
If ObjConta.GetMovimientosAuxiliaresCatalogo(CveCuentaComplementaria, txtFechaI.Text.ToDate, txtFechaF.Text.ToDate, CveMoneda, -1, -1, UsuarioActual.CveEmpresa, "1", -1) Then
If ObjConta.DtResultados.Rows.Count > 1 Then
SaldoFinalContabilidadComplementaria = ObjConta.DtResultados.Rows(1)("SaldoActual").ToString.ToDouble
End If

1
Contabilidad2/RepAnexoCatalogo.aspx
View File

@@ -127,6 +127,7 @@
</div>
</div>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>

21
Nomina/ConceptoNomina.aspx
View File

@@ -223,7 +223,7 @@
<div class="row">
<div class="col-md-6">
<div class="">
<asp:Label runat="server" Text="Concepto contable" AssociatedControlID="DdlConceptoContable"></asp:Label>
<asp:Label runat="server" Text="Concepto contable Activo" 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>
@@ -272,6 +272,25 @@
</div>
</div>--%>
</asp:Panel>
<div class="row">
<div class="col-md-6">
<div class="">
<asp:Label runat="server" Text="Concepto contable Pasivo" AssociatedControlID="DdlCtaContablePasivo"></asp:Label>
<asp:DropDownList ID="DdlConceptoContablePasivo" 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="Cargo ó Abono" AssociatedControlID="ddlCargooAbonoPasivo"></asp:Label>
<asp:DropDownList ID="ddlCargooAbonoPasivo" runat="server" AppendDataBoundItems="True" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar">
<asp:ListItem Value="0" Text="Cargo" />
<asp:ListItem Value="1" Selected="true" Text="Abono" />
</asp:DropDownList>--%>
</div>
</div>
</div>
</asp:Panel>
</div>
</ContentTemplate>

11
Nomina/ConceptoNomina.aspx.cs
View File

@@ -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í");

2
Nomina/Nomina.aspx
View File

@@ -1381,7 +1381,7 @@
<div class="modal-content">
<div class="modal-header ">
<button type="button" class="close" onclick="$('#ModalMovtoPermanente').modal('hide');return;">&times;</button><h4 class="modal-title">Moviento permanente</h4>
<button type="button" class="close" onclick="$('#ModalMovtoPermanente').modal('hide');return;">&times;</button><h4 class="modal-title">Movimiento permanente</h4>
</div>
<div class="modal-body">
<asp:Panel runat="server" Visible="false" CssClass="portlet light xspadding bordered " ID="pnlAddupMovto">

2
RH/Personal.aspx
View File

@@ -1659,7 +1659,7 @@
<div class="modal-content">
<div class="modal-header ">
<button type="button" class="close" onclick="$('#ModalMovtoPermanente').modal('hide');return;">&times;</button><h4 class="modal-title">Moviento permanente</h4>
<button type="button" class="close" onclick="$('#ModalMovtoPermanente').modal('hide');return;">&times;</button><h4 class="modal-title">Movimiento permanente</h4>
</div>
<div class="modal-body">
<asp:Panel runat="server" Visible="false" CssClass="portlet light xspadding bordered " ID="pnlAddupMovto">