This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2024-08-05 01:45:38 -07:00
parent fb0e61bd31
commit 88cd300856
18 changed files with 846 additions and 282 deletions

View File

@@ -840,12 +840,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo IN ('P') AND EsPadre = 1 ").Rows)
{
int CveConcepto = row["CveConcepto"].ToString().ToEntero();
int SoloVisible = row["SoloVisible"].ToString().ToEntero();
int EsFormula = row["EsFormula"].ToString().ToEntero();
string Concepto = row["Concepto"].ToString();
GvNominas.Columns[CurrentColumn].ItemStyle.BackColor = System.Drawing.Color.Transparent;
GvNominas.Columns[CurrentColumn].ItemStyle.CssClass = " ";
GvNominas.Columns[CurrentColumn].HeaderStyle.CssClass = " ";
if (SoloVisible == 1)
if (EsFormula == 1)
{
GvNominas.Columns[CurrentColumn].HeaderStyle.CssClass = "isOnlyVisible ";
@@ -879,12 +879,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
{
int CveConcepto = row["CveConcepto"].ToString().ToEntero();
int CveSistema = row["CveSistema"].ToString().ToEntero();
int SoloVisible = row["SoloVisible"].ToString().ToEntero();
int EsFormula = row["EsFormula"].ToString().ToEntero();
string Concepto = row["Concepto"].ToString();
GvNominas.Columns[CurrentColumn].ItemStyle.BackColor = System.Drawing.Color.Transparent;
GvNominas.Columns[CurrentColumn].ItemStyle.CssClass = " ";
GvNominas.Columns[CurrentColumn].HeaderStyle.CssClass = " ";
if (SoloVisible == 1)
if (EsFormula == 1)
{
GvNominas.Columns[CurrentColumn].HeaderStyle.CssClass = "isOnlyVisible ";
}
@@ -939,12 +939,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo IN ('O') AND EsPadre = 1 ").Rows)
{
int CveConcepto = row["CveConcepto"].ToString().ToEntero();
int SoloVisible = row["SoloVisible"].ToString().ToEntero();
int EsFormula = row["EsFormula"].ToString().ToEntero();
string Concepto = row["Concepto"].ToString();
GvNominas.Columns[CurrentColumn].ItemStyle.BackColor = System.Drawing.Color.Transparent;
GvNominas.Columns[CurrentColumn].ItemStyle.CssClass = " ";
GvNominas.Columns[CurrentColumn].HeaderStyle.CssClass = " ";
if (SoloVisible == 1)
if (EsFormula == 1)
{
GvNominas.Columns[CurrentColumn].HeaderStyle.CssClass = "isOnlyVisible ";
}
@@ -4224,8 +4224,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
{
SRMostrarFormulas = MostrarFormulas;
{
DataTable dtper = dtPerConceptos.FiltraParametros(string.Format("Tipo IN ('P') AND EsPadre = 1 {0}", (MostrarFormulas ? "" : " AND SoloVisible=0")));
DataTable dtded = dtPerConceptos.FiltraParametros(string.Format("Tipo IN ('D') AND EsPadre = 1 AND CveSistema NOT IN(101) {0}", (MostrarFormulas ? "" : " AND SoloVisible=0")));
DataTable dtper = dtPerConceptos.FiltraParametros(string.Format("Tipo IN ('P') AND EsPadre = 1 {0}", (MostrarFormulas ? "" : " AND EsFormula=0")));
DataTable dtded = dtPerConceptos.FiltraParametros(string.Format("Tipo IN ('D') AND EsPadre = 1 AND CveSistema NOT IN(101) {0}", (MostrarFormulas ? "" : " AND EsFormula=0")));
dtper.Columns.Add("BorradoLogico", typeof(int));
dtded.Columns.Add("BorradoLogico", typeof(int));
bool esfinperiodo = false;
@@ -4262,8 +4262,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
row["BorradoLogico"] = BorradoLogico;
}
dtded.AcceptChanges();
dtper = dtper.FiltraParametros("BorradoLogico=0 OR SoloVisible >0");
dtded = dtded.FiltraParametros("BorradoLogico=0 OR SoloVisible >0");
dtper = dtper.FiltraParametros("BorradoLogico=0 OR EsFormula >0");
dtded = dtded.FiltraParametros("BorradoLogico=0 OR EsFormula >0");
int maxper = dtper.Rows.Count;
int maxded = dtded.Rows.Count;
int i = 0;
@@ -4287,7 +4287,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
nConcepto.ImporteP = Importe;
nConcepto.ImporteGravadoP = ImporteGravado;
nConcepto.ValorP = dtPerEmpleados.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.isOnlyBisibleP = row["SoloVisible"].ToString().ToEntero();
nConcepto.isOnlyBisibleP = row["EsFormula"].ToString().ToEntero();
nConcepto.isSavedP = dtPerEmpleadosConceptos.COUNT("CveConcepto", string.Format("CveConcepto={0} AND CvePersonal ={1} AND Estatus >0", CveConcepto, SRCvePersonal));
@@ -4308,7 +4308,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
nConcepto.ImporteD = Importe;
nConcepto.ImporteGravadoD = ImporteGravado;
nConcepto.ValorD = dtPerEmpleados.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.isOnlyBisibleD = row["SoloVisible"].ToString().ToEntero();
nConcepto.isOnlyBisibleD = row["EsFormula"].ToString().ToEntero();
nConcepto.isSavedD = dtPerEmpleadosConceptos.COUNT("CveConcepto", string.Format("CveConcepto={0} AND CvePersonal ={1} AND Estatus >0", CveConcepto, SRCvePersonal));
nConcepto.isEditedD = dtPerEmpleadosConceptos.COUNT("CveConcepto", string.Format("CveConcepto={0} AND CvePersonal ={1} AND Estatus =2", CveConcepto, SRCvePersonal));
}
@@ -4355,7 +4355,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
protected void BtnImprimirsobrerecibo_Click(object sender, EventArgs e)
{
string filtros = "EsPadre = 1 AND SoloVisible =0";
string filtros = "EsPadre = 1 AND EsFormula =0";
string filtros2 = "";
if (UsuarioActual.CveEmpresa == 141)
{
@@ -4416,7 +4416,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
nConcepto.NoConceptoP = Codigo;
nConcepto.ImporteP = Importe;
nConcepto.ImporteGravadoP = ImporteGravado;
nConcepto.isOnlyBisibleP = row["SoloVisible"].ToString().ToEntero();
nConcepto.isOnlyBisibleP = row["EsFormula"].ToString().ToEntero();
nConcepto.CveSistemaP = row["CveSistema"].ToString().ToEntero();
nConcepto.ValorP = dtPerEmpleados.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
@@ -4436,7 +4436,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
nConcepto.ImporteD = Importe;
nConcepto.ImporteGravadoD = ImporteGravado;
nConcepto.CveSistemaD = row["CveSistema"].ToString().ToEntero();
nConcepto.isOnlyBisibleD = row["SoloVisible"].ToString().ToEntero();
nConcepto.isOnlyBisibleD = row["EsFormula"].ToString().ToEntero();
nConcepto.ValorD = dtPerEmpleados.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
}
lconc.Add(nConcepto);
@@ -4928,7 +4928,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
addcoltopersonalizar("Dias Pen Pago", "0", "", "");
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo ='P' AND EsPadre = 1 AND SoloVisible =0").Rows)
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo ='P' AND EsPadre = 1 AND EsFormula =0").Rows)
{
if (!(dtempleados.SUM(string.Format("[V_{0}]", row["CveConcepto"].ToString())) == 0))
{
@@ -4940,7 +4940,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
addcoltopersonalizar("Incapacidad Permisos Faltas", "0", "", "");
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'D' AND EsPadre = 1 AND SoloVisible =0").Rows)//
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'D' AND EsPadre = 1 AND EsFormula =0").Rows)//
{
if (!(dtempleados.SUM(string.Format("[V_{0}]", row["CveConcepto"].ToString())) == 0))
{
@@ -4953,7 +4953,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
//foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'O' AND EsPadre = 1 AND SoloVisible =0").Rows)//SoloVisible =0
//foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'O' AND EsPadre = 1 AND EsFormula =0").Rows)//EsFormula =0
//{
// if (!(dtempleados.SUM(string.Format("[V_{0}]", row["CveConcepto"].ToString())) == 0))
// {
@@ -5124,7 +5124,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
Titlecell(libro, "Pago", filainicio + 3, column, false, true, PercborderColor);
Titlecell(libro, "", filainicio + 4, column, true, true, PercborderColor);
libro.Column(column).Width = 15;
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo ='P' AND EsPadre = 1 AND SoloVisible =0").Rows)
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo ='P' AND EsPadre = 1 AND EsFormula =0").Rows)
{
column++;
if ((dtempleados.SUM(string.Format("[V_{0}]", row["CveConcepto"].ToString())) == 0))
@@ -5160,7 +5160,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
TitleRange(libro, "Perm. Faltas", filainicio + 3, column, filainicio + 3, column, false, true, dedcborderColor);
Titlecell(libro, "", filainicio + 4, column, true, true, dedcborderColor);
libro.Column(column).Width = 15;
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'D' AND EsPadre = 1 AND SoloVisible =0").Rows)
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'D' AND EsPadre = 1 AND EsFormula =0").Rows)
{
column++;
if ((dtempleados.SUM(string.Format("[V_{0}]", row["CveConcepto"].ToString())) == 0))
@@ -5257,7 +5257,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
column++;
libro.Cell(Fila, column).Value = "";
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'P' AND EsPadre = 1 AND SoloVisible =0").Rows)
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'P' AND EsPadre = 1 AND EsFormula =0").Rows)
{
column++;
string Concepto = string.Format("V_{0}", row["CveConcepto"]);
@@ -5292,7 +5292,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
column++;
libro.Cell(Fila, column).Value = "";
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'D' AND EsPadre = 1 AND SoloVisible =0").Rows)
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'D' AND EsPadre = 1 AND EsFormula =0").Rows)
{
column++;
string Concepto = string.Format("V_{0}", row["CveConcepto"]);
@@ -6302,7 +6302,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
int CveConcepto; string Concepto = ""; string Codigo = ""; string importe = ""; string valor = "";
rowx = new GemBox.Document.Tables.TableRow(document);
tconeptos.Rows.Add(rowx);
DataRow rowconcept = dtempleadosConceptos.FiltroPrimero(string.Format("CvePersonal={0} AND Tipo =1 AND SoloVisible =0 AND FilaRaya ={1} AND Importe <> 0 ", CvePersonal, cindex));
DataRow rowconcept = dtempleadosConceptos.FiltroPrimero(string.Format("CvePersonal={0} AND Tipo =1 AND EsFormula =0 AND FilaRaya ={1} AND Importe <> 0 ", CvePersonal, cindex));
if (rowconcept != null)
{
CveConcepto = rowconcept["CveConcepto"].ToString().ToEntero();
@@ -6349,7 +6349,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
CveConcepto = 0; Concepto = ""; importe = ""; Codigo = ""; valor = "";
rowconcept = dtempleadosConceptos.FiltroPrimero(string.Format("CvePersonal={0} AND Tipo =2 AND SoloVisible =0 AND FilaRaya ={1} AND Importe <> 0", CvePersonal, cindex));
rowconcept = dtempleadosConceptos.FiltroPrimero(string.Format("CvePersonal={0} AND Tipo =2 AND EsFormula =0 AND FilaRaya ={1} AND Importe <> 0", CvePersonal, cindex));
if (rowconcept != null)
{
CveConcepto = rowconcept["CveConcepto"].ToString().ToEntero();
@@ -6615,7 +6615,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
rowx = new GemBox.Document.Tables.TableRow(document);
tconeptos.Rows.Add(rowx);
DataRow rowconcept;
rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND SoloVisible =0 AND Tipo ='P'", OrdenP), "Orden");
rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND EsFormula =0 AND Tipo ='P'", OrdenP), "Orden");
bool continuarconcepto = rowconcept != null;
while (continuarconcepto)
{
@@ -6632,7 +6632,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
else
{
rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND SoloVisible =0 AND Tipo ='P'", OrdenP), "Orden");
rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND EsFormula =0 AND Tipo ='P'", OrdenP), "Orden");
continuarconcepto = rowconcept != null;
}
@@ -6685,7 +6685,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
CveConcepto = 0; Concepto = ""; importe = ""; Codigo = "";
rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND SoloVisible =0 AND Tipo ='D'", ordenD), "Orden");
rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND EsFormula =0 AND Tipo ='D'", ordenD), "Orden");
continuarconcepto = rowconcept != null;
while (continuarconcepto)
{
@@ -6703,7 +6703,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
else
{
rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND SoloVisible =0 AND Tipo ='D'", ordenD), "Orden");
rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND EsFormula =0 AND Tipo ='D'", ordenD), "Orden");
continuarconcepto = rowconcept != null;
}
}
@@ -7055,7 +7055,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
rowx = new GemBox.Document.Tables.TableRow(document);
tconeptos.Rows.Add(rowx);
DataRow rowconcept;
while ((rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND SoloVisible =0 AND Tipo ='P'", OrdenP), "Orden")) != null && importe == "")
while ((rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND EsFormula =0 AND Tipo ='P'", OrdenP), "Orden")) != null && importe == "")
{
decimal sumaimporte = dtempleadosConceptos.SUM("Importe", string.Format("CvePersonal > 0 AND CveConcepto={0}", rowconcept["CveConcepto"]));
OrdenP = rowconcept["Orden"].ToString().ToEntero();
@@ -7103,7 +7103,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
CveConcepto = 0; Concepto = ""; importe = ""; Codigo = "";
while ((rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND SoloVisible =0 AND Tipo ='D'", ordenD), "Orden")) != null && importe == "")
while ((rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND EsFormula =0 AND Tipo ='D'", ordenD), "Orden")) != null && importe == "")
{
decimal sumaimporte = dtempleadosConceptos.SUM("Importe", string.Format("CvePersonal > 0 AND CveConcepto={0}", rowconcept["CveConcepto"]));
ordenD = rowconcept["Orden"].ToString().ToEntero();
@@ -7419,7 +7419,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
}
DataRow rowconcept;
while ((rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND SoloVisible =0 AND Tipo ='O'", OrdenO), "Orden")) != null && importe == "")
while ((rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND EsFormula =0 AND Tipo ='O'", OrdenO), "Orden")) != null && importe == "")
{
decimal sumaimporte = dtempleadosConceptos.SUM("Valor", string.Format("CvePersonal > 0 AND CveConcepto={0}", rowconcept["CveConcepto"]));
OrdenO = rowconcept["Orden"].ToString().ToEntero();
@@ -8467,8 +8467,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
protected void BtnImprimirsobrereciboSimula_Click(object sender, EventArgs e)
{
int SRCvePersonal = 1;
DataTable dtper = dtConceptosSimula.FiltraParametros("Tipo IN ('P') AND EsPadre = 1 AND SoloVisible =0");
DataTable dtded = dtConceptosSimula.FiltraParametros("Tipo IN ('D') AND EsPadre = 1 AND SoloVisible =0");
DataTable dtper = dtConceptosSimula.FiltraParametros("Tipo IN ('P') AND EsPadre = 1 AND EsFormula =0");
DataTable dtded = dtConceptosSimula.FiltraParametros("Tipo IN ('D') AND EsPadre = 1 AND EsFormula =0");
dtper.Columns.Add("BorradoLogico", typeof(int));
dtded.Columns.Add("BorradoLogico", typeof(int));