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:
JORGE LUIS CAUDILLO ESPARZA
2023-11-20 07:38:36 -07:00
parent 13f7b26b2d 3a7d43744b
commit f599c7a3fb
120 changed files with 20969 additions and 2499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Nomina/Finiquito.aspx.cs
View File

@@ -965,7 +965,7 @@ public partial class Nomina_Finiquito : ClsPaginas
string Concepto = row["Concepto"].ToString();
string Codigo = row["Codigo"].ToString();
//bool visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
double Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
decimal Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.CveConceptoP = CveConcepto;
nConcepto.ConceptoP = Concepto;
nConcepto.NoConceptoP = Codigo;
@@ -985,7 +985,7 @@ public partial class Nomina_Finiquito : ClsPaginas
string Concepto = row["Concepto"].ToString();
string Codigo = row["Codigo"].ToString();
//bool visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
double Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
decimal Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.CveConceptoD = CveConcepto;
nConcepto.ConceptoD = Concepto;
nConcepto.NoConceptoD = Codigo;
@@ -1015,7 +1015,7 @@ public partial class Nomina_Finiquito : ClsPaginas
SubTotales.EstatusD = -2;
SubTotales.ImporteD = dtempleados.SUM("SumaDeducciones", string.Format("CvePersonal = {0}", SRCvePersonal)) ;
double neto = SubTotales.ImporteP - SubTotales.ImporteD;
decimal neto = SubTotales.ImporteP - SubTotales.ImporteD;
NConcepto Totales = new NConcepto();
Totales.CveConceptoD = 0;
Totales.ConceptoD = "Total";
@@ -1076,7 +1076,7 @@ public partial class Nomina_Finiquito : ClsPaginas
string Concepto = row["Concepto"].ToString();
string Codigo = row["Codigo"].ToString();
//bool visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
double Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
decimal Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.CveConceptoP = CveConcepto;
nConcepto.ConceptoP = Concepto;
nConcepto.NoConceptoP = Codigo;
@@ -1095,7 +1095,7 @@ public partial class Nomina_Finiquito : ClsPaginas
string Concepto = row["Concepto"].ToString();
string Codigo = row["Codigo"].ToString();
//bool visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
double Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
decimal Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.CveConceptoD = CveConcepto;
nConcepto.ConceptoD = Concepto;
nConcepto.NoConceptoD = Codigo;
@@ -1126,7 +1126,7 @@ public partial class Nomina_Finiquito : ClsPaginas
SubTotales.ImporteD = dtempleados.SUM("SumaDeducciones", string.Format("CvePersonal = {0}", SRCvePersonal));
double neto = SubTotales.ImporteP - SubTotales.ImporteD;
decimal neto = SubTotales.ImporteP - SubTotales.ImporteD;
NConcepto Totales = new NConcepto();
Totales.CveConceptoD = 0;
Totales.ConceptoD = "Total";
@@ -1532,7 +1532,7 @@ public partial class Nomina_Finiquito : ClsPaginas
string Concepto = row["Concepto"].ToString();
string Codigo = row["Codigo"].ToString();
//bool visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
double Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", CvePersonal));
decimal Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", CvePersonal));
nConcepto.CveConceptoP = CveConcepto;
nConcepto.ConceptoP = Concepto;
nConcepto.NoConceptoP = Codigo;
@@ -1546,7 +1546,7 @@ public partial class Nomina_Finiquito : ClsPaginas
string Concepto = row["Concepto"].ToString();
string Codigo = row["Codigo"].ToString();
//bool visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
double Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", CvePersonal));
decimal Importe = dtempleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", CvePersonal));
nConcepto.CveConceptoD = CveConcepto;
nConcepto.ConceptoD = Concepto;
nConcepto.NoConceptoD = Codigo;

46
Nomina/Nomina.aspx.cs
View File

@@ -4276,8 +4276,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
string Concepto = row["Concepto"].ToString();
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));
decimal Importe = dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
decimal ImporteGravado = dtPerEmpleados.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.CveConceptoP = CveConcepto;
nConcepto.ConceptoP = Concepto;
nConcepto.NoConceptoP = Codigo;
@@ -4297,8 +4297,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
string Concepto = row["Concepto"].ToString();
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));
decimal Importe = dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
decimal ImporteGravado = dtPerEmpleados.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.CveConceptoD = CveConcepto;
nConcepto.ConceptoD = Concepto;
nConcepto.NoConceptoD = Codigo;
@@ -4396,8 +4396,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
string Concepto = row["Concepto"].ToString();
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));
decimal Importe = dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
decimal ImporteGravado = dtPerEmpleados.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.CveConceptoP = CveConcepto;
nConcepto.ConceptoP = Concepto;
nConcepto.NoConceptoP = Codigo;
@@ -4415,8 +4415,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
string Concepto = row["Concepto"].ToString();
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));
decimal Importe = dtPerEmpleados.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
decimal ImporteGravado = dtPerEmpleados.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.CveConceptoD = CveConcepto;
nConcepto.ConceptoD = Concepto;
nConcepto.NoConceptoD = Codigo;
@@ -6014,7 +6014,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
bool continuarconcepto = rowconcept != null;
while (continuarconcepto)
{
double sumaimporte = dtempleadosConceptos.SUM("Importe", string.Format("CvePersonal > 0 AND CveSubProyecto={0} AND CveConcepto={1} AND Importe <> 0", CveSubProyecto, rowconcept["CveConcepto"]));
decimal sumaimporte = dtempleadosConceptos.SUM("Importe", string.Format("CvePersonal > 0 AND CveSubProyecto={0} AND CveConcepto={1} AND Importe <> 0", CveSubProyecto, rowconcept["CveConcepto"]));
OrdenP = rowconcept["Orden"].ToString().ToEntero();
if (sumaimporte != 0)
{
@@ -6084,7 +6084,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
continuarconcepto = rowconcept != null;
while (continuarconcepto)
{
double sumaimporte = dtempleadosConceptos.SUM("Importe", string.Format("CvePersonal > 0 AND CveSubProyecto={0} AND CveConcepto={1} AND Importe <> 0", CveSubProyecto, rowconcept["CveConcepto"]));
decimal sumaimporte = dtempleadosConceptos.SUM("Importe", string.Format("CvePersonal > 0 AND CveSubProyecto={0} AND CveConcepto={1} AND Importe <> 0", CveSubProyecto, rowconcept["CveConcepto"]));
ordenD = rowconcept["Orden"].ToString().ToEntero();
if (sumaimporte != 0)
{
@@ -6402,7 +6402,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
DataRow rowconcept;
while ((rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND SoloVisible =0 AND Tipo ='P'", OrdenP), "Orden")) != null && importe == "")
{
double sumaimporte = dtempleadosConceptos.SUM("Importe", string.Format("CvePersonal > 0 AND CveConcepto={0}", rowconcept["CveConcepto"]));
decimal sumaimporte = dtempleadosConceptos.SUM("Importe", string.Format("CvePersonal > 0 AND CveConcepto={0}", rowconcept["CveConcepto"]));
OrdenP = rowconcept["Orden"].ToString().ToEntero();
if (sumaimporte != 0)
{
@@ -6450,7 +6450,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
while ((rowconcept = dtConceptos.FiltroPrimero(string.Format("Orden>{0} AND SoloVisible =0 AND Tipo ='D'", ordenD), "Orden")) != null && importe == "")
{
double sumaimporte = dtempleadosConceptos.SUM("Importe", string.Format("CvePersonal > 0 AND CveConcepto={0}", rowconcept["CveConcepto"]));
decimal sumaimporte = dtempleadosConceptos.SUM("Importe", string.Format("CvePersonal > 0 AND CveConcepto={0}", rowconcept["CveConcepto"]));
ordenD = rowconcept["Orden"].ToString().ToEntero();
if (sumaimporte != 0)
{
@@ -6766,7 +6766,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 == "")
{
double sumaimporte = dtempleadosConceptos.SUM("Valor", string.Format("CvePersonal > 0 AND CveConcepto={0}", rowconcept["CveConcepto"]));
decimal sumaimporte = dtempleadosConceptos.SUM("Valor", string.Format("CvePersonal > 0 AND CveConcepto={0}", rowconcept["CveConcepto"]));
OrdenO = rowconcept["Orden"].ToString().ToEntero();
if (sumaimporte != 0)
{
@@ -7717,8 +7717,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
string Concepto = row["Concepto"].ToString();
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));
decimal Importe = dtempleadosSimula.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
decimal ImporteGravado = dtempleadosSimula.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
nConcepto.CveConceptoP = CveConcepto;
nConcepto.ConceptoP = Concepto;
nConcepto.NoConceptoP = Codigo;
@@ -7733,8 +7733,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
string Concepto = row["Concepto"].ToString();
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));
decimal Importe = dtempleadosSimula.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
decimal ImporteGravado = dtempleadosSimula.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
nConcepto.CveConceptoD = CveConcepto;
nConcepto.ConceptoD = Concepto;
nConcepto.NoConceptoD = Codigo;
@@ -7749,8 +7749,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
string Concepto = row["Concepto"].ToString();
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));
decimal Importe = dtempleadosSimula.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
decimal ImporteGravado = dtempleadosSimula.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", 1));
nConcepto.CveConceptoO = CveConcepto;
nConcepto.ConceptoO = Concepto;
nConcepto.NoConceptoO = Codigo;
@@ -7844,9 +7844,9 @@ public partial class Nomina_Nomina2 : ClsPaginas
string Concepto = row["Concepto"].ToString();
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));
decimal 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));
decimal ImporteGravado = dtempleadosSimula.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.CveConceptoP = CveConcepto;
nConcepto.ConceptoP = Concepto;
nConcepto.NoConceptoP = Codigo;
@@ -7862,8 +7862,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
string Concepto = row["Concepto"].ToString();
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));
decimal Importe = dtempleadosSimula.SUM(string.Format("[V_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
decimal ImporteGravado = dtempleadosSimula.SUM(string.Format("[VG_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
nConcepto.CveConceptoD = CveConcepto;
nConcepto.ConceptoD = Concepto;
nConcepto.NoConceptoD = Codigo;