This commit is contained in:
@@ -3979,21 +3979,21 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
{
|
||||
DiasLaborados = string.Format("{0}", drow["DiasLaborados"].ToString().ToEntero());
|
||||
DiasFaltados = string.Format("{0}", drow["DiasFaltados"].ToString().ToEntero());
|
||||
DiasVacaciones = string.Format("{0}", drow["DiasVacaciones"].ToString().ToEntero());
|
||||
DiasVacaciones = string.Format("{0}", drow["DiasVacacionesPorPagar"].ToString().ToEntero());//DiasVacaciones
|
||||
FechaInicio = string.Format("{0:dd/MM/yyyy}", drow["FechaInicio"]);
|
||||
FechaFin = string.Format("{0:dd/MM/yyyy}", drow["FechaFin"]);
|
||||
DiasRetardos = string.Format("{0}", drow["DiasRetardos"].ToString().ToEntero());
|
||||
DiasIncapacidad = string.Format("{0}", drow["DiasIncapacidad"].ToString().ToEntero());
|
||||
SD = string.Format("{0:####.####}", drow["SalarioDiario"]);
|
||||
SDI = string.Format("{0:####.####}", drow["SalarioDiarioIntegrado"]);
|
||||
SalarioDiarioIMSS = string.Format("{0:####.####}", drow["SalarioDiarioIMSS"]);
|
||||
SD = string.Format("{0:###0.00##}", drow["SalarioDiario"]);
|
||||
SDI = string.Format("{0:###0.00##}", drow["SalarioDiarioIntegrado"]);
|
||||
SalarioDiarioIMSS = string.Format("{0:###0.00##}", drow["SalarioDiarioIMSS"]);
|
||||
}
|
||||
|
||||
LblDiasLaborados.Text = DiasLaborados;
|
||||
LblDiasFaltados.Text = DiasFaltados;
|
||||
LblDiasVacaciones.Text = DiasVacaciones;
|
||||
LblFecha.Text = string.Format("{0} al {1}", FechaInicio, FechaFin);
|
||||
LblDiasRetardos.Text = DiasRetardos;
|
||||
//LblDiasRetardos.Text = DiasRetardos;
|
||||
LblDiasIncapacidad.Text = DiasIncapacidad;
|
||||
LblSRSalarioDiario.Text = SD;
|
||||
LblSRSalarioDiarioIntegrado.Text = SDI;
|
||||
@@ -4210,13 +4210,17 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
DataTable dtded = dtPerConceptos.FiltraParametros(string.Format("Tipo IN ('D') AND EsPadre = 1 AND CveSistema NOT IN(101) {0}", (MostrarFormulas ? "" : " AND SoloVisible=0")));
|
||||
dtper.Columns.Add("BorradoLogico", typeof(int));
|
||||
dtded.Columns.Add("BorradoLogico", typeof(int));
|
||||
|
||||
bool esfinperiodo = false;
|
||||
if(dtPerPeriodo.Rows.Count > 0)
|
||||
{
|
||||
esfinperiodo = (dtPerPeriodo.Rows[0]["EsFinMes"].ToString().ToEntero() == 1);
|
||||
}
|
||||
foreach (DataRow row in dtper.Rows)
|
||||
{
|
||||
int BorradoLogico = 0;
|
||||
int CveConcepto = row["CveConcepto"].ToString().ToEntero();
|
||||
if (!(dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal)) != 0)
|
||||
&& (dtPerEmpleadosConceptos.COUNT("CveConcepto", string.Format("CveConcepto={0} AND CvePersonal ={1} AND Estatus =2", CveConcepto, SRCvePersonal)) == 0)
|
||||
&& (dtPerEmpleadosConceptos.COUNT("CveConcepto", string.Format("CveConcepto={0} AND CvePersonal ={1} AND Estatus >0", CveConcepto, SRCvePersonal)) == 0)
|
||||
)
|
||||
{
|
||||
BorradoLogico = 1;
|
||||
@@ -4229,10 +4233,10 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
int BorradoLogico = 0;
|
||||
int CveConcepto = row["CveConcepto"].ToString().ToEntero();
|
||||
if (!(dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal)) != 0)
|
||||
&& (dtPerEmpleadosConceptos.COUNT("CveConcepto", string.Format("CveConcepto={0} AND CvePersonal ={1} AND Estatus =2", CveConcepto, SRCvePersonal)) == 0)
|
||||
&& (dtPerEmpleadosConceptos.COUNT("CveConcepto", string.Format("CveConcepto={0} AND CvePersonal ={1} AND Estatus >0", CveConcepto, SRCvePersonal)) == 0)
|
||||
)
|
||||
{
|
||||
if (!row["CveSistema"].ToString().ToEntero().Contiene(new int[] { 20, 21, 112, 202, 203, 204, 205, 206, 207, 50, 51 }))
|
||||
if (!(esfinperiodo && row["CveSistema"].ToString().ToEntero().Contiene(new int[] { 20, 21, 112, 202, 203, 204, 205, 206, 207, 50, 51 })))
|
||||
{
|
||||
BorradoLogico = 1;
|
||||
}
|
||||
@@ -4240,8 +4244,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
row["BorradoLogico"] = BorradoLogico;
|
||||
}
|
||||
dtded.AcceptChanges();
|
||||
dtper = dtper.FiltraParametros("BorradoLogico=0");
|
||||
dtded = dtded.FiltraParametros("BorradoLogico=0");
|
||||
dtper = dtper.FiltraParametros("BorradoLogico=0 OR SoloVisible >0");
|
||||
dtded = dtded.FiltraParametros("BorradoLogico=0 OR SoloVisible >0");
|
||||
int maxper = dtper.Rows.Count;
|
||||
int maxded = dtded.Rows.Count;
|
||||
int i = 0;
|
||||
@@ -4258,12 +4262,14 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
string Codigo = row["Codigo"].ToString();
|
||||
//bool visible = (dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
|
||||
double Importe = dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
double ImporteGravado = dtPerEmpleados.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
nConcepto.CveConceptoP = CveConcepto;
|
||||
nConcepto.ConceptoP = Concepto;
|
||||
nConcepto.NoConceptoP = Codigo;
|
||||
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["SoloVisible"].ToString().ToEntero();
|
||||
|
||||
|
||||
nConcepto.isSavedP = dtPerEmpleadosConceptos.COUNT("CveConcepto", string.Format("CveConcepto={0} AND CvePersonal ={1} AND Estatus >0", CveConcepto, SRCvePersonal));
|
||||
@@ -4277,10 +4283,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
string Codigo = row["Codigo"].ToString();
|
||||
//bool visible = (dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
|
||||
double Importe = dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
double ImporteGravado = dtPerEmpleados.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
nConcepto.CveConceptoD = CveConcepto;
|
||||
nConcepto.ConceptoD = Concepto;
|
||||
nConcepto.NoConceptoD = Codigo;
|
||||
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.isSavedD = dtPerEmpleadosConceptos.COUNT("CveConcepto", string.Format("CveConcepto={0} AND CvePersonal ={1} AND Estatus >0", CveConcepto, SRCvePersonal));
|
||||
@@ -4296,6 +4304,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
SubTotales.ConceptoP = "Total Percepciones";
|
||||
SubTotales.EstatusP = -2;
|
||||
SubTotales.ImporteP = dtPerEmpleados.SUM("SumaPercepciones", string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
SubTotales.ImporteGravadoP = dtPerEmpleados.SUM("SumaPercepcionesG", string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
///Alert(SubTotales.ImporteP.ToString());
|
||||
|
||||
SubTotales.CveConceptoD = 0;
|
||||
@@ -4373,10 +4382,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
string Codigo = row["Codigo"].ToString();
|
||||
//bool visible = (dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
|
||||
double Importe = dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
double ImporteGravado = dtPerEmpleados.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
nConcepto.CveConceptoP = CveConcepto;
|
||||
nConcepto.ConceptoP = Concepto;
|
||||
nConcepto.NoConceptoP = Codigo;
|
||||
nConcepto.ImporteP = Importe;
|
||||
nConcepto.ImporteGravadoP = ImporteGravado;
|
||||
nConcepto.isOnlyBisibleP = row["SoloVisible"].ToString().ToEntero();
|
||||
nConcepto.CveSistemaP = row["CveSistema"].ToString().ToEntero();
|
||||
|
||||
@@ -4390,10 +4401,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
string Codigo = row["Codigo"].ToString();
|
||||
//bool visible = (dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
|
||||
double Importe = dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
double ImporteGravado = dtPerEmpleados.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
nConcepto.CveConceptoD = CveConcepto;
|
||||
nConcepto.ConceptoD = Concepto;
|
||||
nConcepto.NoConceptoD = Codigo;
|
||||
nConcepto.ImporteD = Importe;
|
||||
nConcepto.ImporteGravadoD = ImporteGravado;
|
||||
nConcepto.CveSistemaD = row["CveSistema"].ToString().ToEntero();
|
||||
nConcepto.isOnlyBisibleD = row["SoloVisible"].ToString().ToEntero();
|
||||
nConcepto.ValorD = dtPerEmpleados.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
@@ -4408,6 +4421,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
SubTotales.ConceptoP = "Total Percepciones";
|
||||
SubTotales.EstatusP = -2;
|
||||
SubTotales.ImporteP = dtPerEmpleados.SUM("SumaPercepciones", string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
SubTotales.ImporteGravadoP = dtPerEmpleados.SUM("SumaPercepcionesG", string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
///Alert(SubTotales.ImporteP.ToString());
|
||||
|
||||
SubTotales.CveConceptoD = 0;
|
||||
@@ -4591,6 +4605,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
public string LabelValorP { get; set; }
|
||||
public int CveConceptoP { get; set; }
|
||||
public double ImporteP { get; set; }
|
||||
public double ImporteGravadoP { get; set; }
|
||||
public double ValorP { get; set; }
|
||||
public int EstatusP { get; set; }
|
||||
public int isSavedP { get; set; }
|
||||
@@ -4604,6 +4619,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
public string LabelValorD { get; set; }
|
||||
public int CveConceptoD { get; set; }
|
||||
public double ImporteD { get; set; }
|
||||
public double ImporteGravadoD { get; set; }
|
||||
public double ValorD { get; set; }
|
||||
public int EstatusD { get; set; }
|
||||
public int isSavedD { get; set; }
|
||||
@@ -4620,6 +4636,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
public string LabelValorO { get; set; }
|
||||
public int CveConceptoO { get; set; }
|
||||
public double ImporteO { get; set; }
|
||||
public double ImporteGravadoO { get; set; }
|
||||
public double ValorO { get; set; }
|
||||
public int EstatusO { get; set; }
|
||||
public int isEditedO { get; set; }
|
||||
@@ -6899,7 +6916,15 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
Response.AddHeader("content-disposition", $"attachment;filename=Lista de Raya.pdf");
|
||||
Response.Buffer = true;
|
||||
memoryStream.WriteTo(Response.OutputStream);
|
||||
try
|
||||
{
|
||||
|
||||
Response.End();
|
||||
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -7731,10 +7756,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
string Codigo = row["Codigo"].ToString();
|
||||
//bool visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
|
||||
double Importe = dtempleadosSimula.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
|
||||
double ImporteGravado = dtempleadosSimula.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
|
||||
nConcepto.CveConceptoP = CveConcepto;
|
||||
nConcepto.ConceptoP = Concepto;
|
||||
nConcepto.NoConceptoP = Codigo;
|
||||
nConcepto.ImporteP = Importe;
|
||||
nConcepto.ImporteGravadoP = ImporteGravado;
|
||||
nConcepto.ValorP = dtempleadosSimula.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
|
||||
}
|
||||
if (maxded > i)
|
||||
@@ -7745,10 +7772,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
string Codigo = row["Codigo"].ToString();
|
||||
//bool visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
|
||||
double Importe = dtempleadosSimula.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
|
||||
double ImporteGravado = dtempleadosSimula.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
|
||||
nConcepto.CveConceptoD = CveConcepto;
|
||||
nConcepto.ConceptoD = Concepto;
|
||||
nConcepto.NoConceptoD = Codigo;
|
||||
nConcepto.ImporteD = Importe;
|
||||
nConcepto.ImporteGravadoD = ImporteGravado;
|
||||
nConcepto.ValorD = dtempleadosSimula.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
|
||||
}
|
||||
if (maxObl > i)
|
||||
@@ -7759,10 +7788,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
string Codigo = row["Codigo"].ToString();
|
||||
//bool visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
|
||||
double Importe = dtempleadosSimula.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
|
||||
double ImporteGravado = dtempleadosSimula.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
|
||||
nConcepto.CveConceptoO = CveConcepto;
|
||||
nConcepto.ConceptoO = Concepto;
|
||||
nConcepto.NoConceptoO = Codigo;
|
||||
nConcepto.ImporteO = Importe;
|
||||
nConcepto.ImporteGravadoO = ImporteGravado;
|
||||
nConcepto.ValorO = dtempleadosSimula.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
|
||||
}
|
||||
lconc.Add(nConcepto);
|
||||
@@ -7775,6 +7806,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
SubTotales.ConceptoP = "Total Percepciones";
|
||||
SubTotales.EstatusP = -2;
|
||||
SubTotales.ImporteP = dtempleadosSimula.SUM("SumaPercepciones", string.Format("CvePersonal = {0}", 1));
|
||||
SubTotales.ImporteGravadoP = dtempleadosSimula.SUM("SumaPercepcionesG", string.Format("CvePersonal = {0}", 1));
|
||||
///Alert(SubTotales.ImporteP.ToString());
|
||||
|
||||
SubTotales.CveConceptoD = 0;
|
||||
@@ -7851,10 +7883,13 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
string Codigo = row["Codigo"].ToString();
|
||||
//bool visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
|
||||
double Importe = dtempleadosSimula.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
|
||||
double ImporteGravado = dtempleadosSimula.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
nConcepto.CveConceptoP = CveConcepto;
|
||||
nConcepto.ConceptoP = Concepto;
|
||||
nConcepto.NoConceptoP = Codigo;
|
||||
nConcepto.ImporteP = Importe;
|
||||
nConcepto.ImporteGravadoP = ImporteGravado;
|
||||
nConcepto.CveSistemaP = row["CveSistema"].ToString().ToEntero();
|
||||
nConcepto.ValorP = dtempleadosSimula.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
}
|
||||
@@ -7866,10 +7901,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
string Codigo = row["Codigo"].ToString();
|
||||
//bool visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
|
||||
double Importe = dtempleadosSimula.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
double ImporteGravado = dtempleadosSimula.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
nConcepto.CveConceptoD = CveConcepto;
|
||||
nConcepto.ConceptoD = Concepto;
|
||||
nConcepto.NoConceptoD = Codigo;
|
||||
nConcepto.ImporteD = Importe;
|
||||
nConcepto.ImporteGravadoD = ImporteGravado;
|
||||
nConcepto.CveSistemaD = row["CveSistema"].ToString().ToEntero();
|
||||
nConcepto.ValorD = dtempleadosSimula.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
}
|
||||
@@ -7883,6 +7920,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
|
||||
SubTotales.ConceptoP = "Total Percepciones";
|
||||
SubTotales.EstatusP = -2;
|
||||
SubTotales.ImporteP = dtempleadosSimula.SUM("SumaPercepciones", string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
SubTotales.ImporteGravadoP = dtempleadosSimula.SUM("SumaPercepcionesG", string.Format("CvePersonal = {0}", SRCvePersonal));
|
||||
///Alert(SubTotales.ImporteP.ToString());
|
||||
|
||||
SubTotales.CveConceptoD = 0;
|
||||
|
||||
Reference in New Issue
Block a user