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-11-12 21:22:03 -07:00
parent 053512112c 5b3f1e2a03
commit 2ff66c718f
6 changed files with 117 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Nomina/Nomina.aspx.cs
View File

@@ -3936,9 +3936,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
if (continuar)
{
cargaDatos(CvePersonal: SRCvePersonal);
cargaBitacora();
if (PnlConceptoPersonal.Visible)
{
cargaBitacora();
cargasobrericiboconceptos(SRMostrarFormulas);
cargasobrericiboconceptos(SRMostrarFormulas);
}
UpGvConceptos.Update();
RegistraScript("$('#ModalUpConcepto').modal('hide');");
@@ -7114,7 +7117,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
CcveMovtoPermanente = gvRow.DataKey("CveMovtoPermanente").ToEntero();
int cveConcepto = gvRow.DataKey("CveConcepto").ToEntero();
int cvePersonal = gvRow.DataKey("CvePersonal").ToEntero();
int CveCuenta = gvRow.DataKey("CveCuenta").ToEntero();
int CveCuenta = gvRow.DataKey("CveCuenta").ToEntero();
string descripcion = gvRow.DataKey("Descripcion");
int tipoDescuento = gvRow.DataKey("TipoDescuento").ToEntero();
double valor = gvRow.DataKey("Valor").ToDouble();
@@ -7141,7 +7144,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
TxtVecesAplicar.Text = vecesAplicar.ToString();
TxtMontoLimite.Text = montoLimite.ToString();
TxtFechaAplicacion.Text = $"{fechaInicioAplicacion:dd/MM/yyyy}";
DdlCtaContable.SelectedValueExist("-1");
DdlCtaContable.SelectedValueExist("-1");
ChkEstatus.Checked = estatus;
RegistraScript("$('#ModalMovtoPermanente').modal()");
@@ -10168,7 +10171,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
if (essua)
{
System.IO.Stream fs=(new CedulaSuaPDF()).writexls(dirPDF);
System.IO.Stream fs = (new CedulaSuaPDF()).writexls(dirPDF);
fs.Position = 0;
System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
using (System.IO.Stream input = fs)
@@ -10187,8 +10190,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
else
{
System.IO.Stream fs =(new CedulaEBAPDF()).writexls(dirPDF);
System.IO.Stream fs = (new CedulaEBAPDF()).writexls(dirPDF);
fs.Position = 0;
System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
using (System.IO.Stream input = fs)
@@ -10655,8 +10658,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
}
libro.Range(2, 7, row, dataEBAPDF.ContieneLic ?15:16).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Right;
libro.Range(2, dataEBAPDF.ContieneLic ? 17:18, row, dataEBAPDF.ContieneLic ? 20:21).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Right;
libro.Range(2, 7, row, dataEBAPDF.ContieneLic ? 15 : 16).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Right;
libro.Range(2, dataEBAPDF.ContieneLic ? 17 : 18, row, dataEBAPDF.ContieneLic ? 20 : 21).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Right;
//libro.Range(2, 7, row, 15).Style.NumberFormat.Format = "$ #,##0.00";
//libro.Range(2, 17, row, 20).Style.NumberFormat.Format = "$ #,##0.00";
libro.Columns().AdjustToContents();
@@ -10681,7 +10684,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
if (!isTitulo)
{
text = text.Replace(strtitulo.ToString(), "");
}
}
cedulaSUAEmpleados cempleado = null;
string[] lines = text.Split('\n');
int pasoCaptura = 0;
@@ -10789,11 +10792,11 @@ public partial class Nomina_Nomina2 : ClsPaginas
strb.AppendLine("/*NEWPAGE*/");
}
}
objSUA.txtTodo = strb.ToString();
return objSUA;
}
public cedulaSUAEmpleados procesapaso4(string line, cedulaSUAEmpleados empleado,bool ContieneLic)
public cedulaSUAEmpleados procesapaso4(string line, cedulaSUAEmpleados empleado, bool ContieneLic)
{
if (line.ToUpper().Contains("Página".ToUpper()))
{
@@ -10855,7 +10858,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
if (col < l && !ismsfsd) { dtos.SDI = splitedline[col++]; }
if (col < l && splitedline[col] == "") { col++; }
if(ContieneLic && col < l && !ismsfsd) { dtos.Lic = splitedline[col++]; }
if (ContieneLic && col < l && !ismsfsd) { dtos.Lic = splitedline[col++]; }
if (col < l && splitedline[col] == "") { col++; }
if (col < l && !ismsfsd) { dtos.Inc = splitedline[col++]; }
if (col < l && splitedline[col] == "") { col++; }