concepto,Turno
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
@@ -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">
|
||||
|
||||
@@ -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)
|
||||
//{
|
||||
//}
|
||||
|
||||
Reference in New Issue
Block a user