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-04-19 06:12:12 -07:00
parent 860b14e7dc 6c8b6f24c3
commit e2df7d1645
13 changed files with 332 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Nomina/ConceptoNomina.aspx
View File

@@ -277,7 +277,7 @@
<div class="row">
<div class="col-md-6">
<div class="">
<asp:Label runat="server" Text="Concepto contable Pasivo" AssociatedControlID="DdlCtaContablePasivo"></asp:Label>
<asp:Label runat="server" Text="Concepto contable Pasivo" AssociatedControlID="DdlConceptoContablePasivo"></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>

4
Nomina/ConceptoNomina.aspx.cs
View File

@@ -530,7 +530,7 @@ public partial class Nomina_CatConcepto : ClsPaginas
{
DdlCtaContableB.SelectedValueExist(drow["CveCuentaB"]);
}
if (ChkContabiliza.Checked && (DdlCtaContable.SelectedValue.ToEntero() <= 0 || (chkCtaImporteNegativoProv.Checked && DdlCtaContableB.SelectedValue.ToEntero() <= 0)))
if (ChkContabiliza.Checked && (DdlConceptoContable.SelectedValue.ToEntero() <= 0 || DdlConceptoContablePasivo.SelectedValue.ToEntero() <= 0 || (chkCtaImporteNegativoProv.Checked && DdlConceptoContableB .SelectedValue.ToEntero() <= 0)))
{
Alert("el concepto esta marcado como contabilizable pero no estan asignadas correctamente las cuentas.", ModExtensiones.TipoMensaje.MsgAdvertencia);
}
@@ -627,7 +627,7 @@ public partial class Nomina_CatConcepto : ClsPaginas
string formula = TxtFormula.Text;
using (ClsNominas objnom = new ClsNominas())
{
if (TipoFormula == 0 && !ValidaFormula(formula).Equals(""))
if (false &&TipoFormula == 0 && !ValidaFormula(formula).Equals(""))
{
Alert("Fórmula no válida. Favor de ingresar una correcta.", ModExtensiones.TipoMensaje.MsgError);
}