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
2025-05-06 19:32:32 -07:00
parent 4db03c7c65 b42c7366b3
commit af7a188a8a
16 changed files with 290 additions and 3838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Nomina/CatSatConceptos.aspx.vb
View File

@@ -16,7 +16,7 @@ Partial Class Nom_CatSatConceptos
End Sub
Public Sub CargaDatos()
Dim ObjConceptos As New ClsNominas
Dim GetConceptoSAT As New ClsNominas
If ObjConceptos.GetConceptos() Then
ViewState("DTConceptos") = ObjConceptos.DtResultados
GlobalDTNomSatConceptos = ObjConceptos.DtResultados

2
Nomina/ConceptoNomina.aspx.cs
View File

@@ -265,7 +265,7 @@ public partial class Nomina_CatConcepto : ClsPaginas
{
using (ClsNominas objnom = new ClsNominas())
{
objnom.GetConceptos();
objnom.GetConceptoSAT();
DdlConceptoSAT.DataSource = objnom.DtResultados;
}

53
Nomina/Nomina.aspx
View File

@@ -7,7 +7,13 @@
#pnlIncapacidade .form-group.form-md-line-input > .select2-container {
margin-top: 20px;
}
#C_UpModalConceptos > .modal-content{
height: calc(100vh - 50px) !important;
}
#C_UpModalConceptos > .modal-content > .modal-body {
height: calc(100vh - 150px);
overflow-y: auto;
}
.lnkMovotPermanente {
width: 100%;
color: #111;
@@ -1364,6 +1370,49 @@
<asp:CheckBox ID="ChkFonacot" CssClass="chksino" runat="server" Text=" " />
</div>
</div>
<asp:GridView ID="GVFonacotDetalle" runat="server" GridLines="None" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" BorderWidth="1" BorderColor="#D3D3D3" CellSpacing="0" Width="100%" AutoGenerateColumns="False" data-heighterror="600"
DataKeyNames="CveTipo,Nombre,Concepto,CveFonacot,FechaFin,CvePeriodo,NoPagos,ImportePagos,Pagado,Total,Saldo,Fecha">
<Columns>
<asp:TemplateField HeaderText="Nombre">
<ItemTemplate>
<asp:Label ID="lblnombre" runat="server" Text='<%# Eval("Nombre")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Fecha">
<ItemTemplate>
<asp:Label ID="lblfecha" runat="server" Text='<%# Eval("Fecha")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="No Pagos">
<ItemTemplate>
<asp:Label ID="lblnoPagos" runat="server" Text='<%# Eval("NoPagos")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Importe Pago">
<ItemTemplate>
<asp:Label ID="lblimportePagos" runat="server" Text='<%# Eval("ImportePagos", "{0:N2}")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Pagado">
<ItemTemplate>
<asp:Label ID="lblpagado" runat="server" Text='<%# Eval("Pagado", "{0:N2}")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Total">
<ItemTemplate>
<asp:Label ID="lbltotal" runat="server" Text='<%# Eval("Total", "{0:N2}")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Saldo">
<ItemTemplate>
<asp:Label ID="lblsaldo" runat="server" Text='<%# Eval("Saldo", "{0:N2}")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
</ContentTemplate>
</asp:UpdatePanel>
</div>
@@ -5259,7 +5308,7 @@
</div>
</div>
<asp:GridView ID="GvPersonalizarExcel" DataKeyNames="Columna,ColumnaDB,Tipo,TipoDB" runat="server" GridLines="None" Width="100%" CellSpacing="0"
CssClass="table table-striped table-advance table-hover Widthall ScrollAD mysmallbtn" data-sort="true" AutoGenerateColumns="False">
CssClass="table table-striped table-advance table-hover Widthall ScrollAD mysmallbtn" data-sort="true" AutoGenerateColumns="False" data-heighterror="460">
<Columns>
<asp:BoundField DataField="Columna" HeaderText="Columna" ItemStyle-HorizontalAlign="Left" HeaderStyle-HorizontalAlign="Left" />
<%--<asp:BoundField DataField="Tipo" HeaderText="Tipo" ItemStyle-HorizontalAlign="Left" HeaderStyle-HorizontalAlign="Left" />--%>

45
Nomina/Nomina.aspx.cs
View File

@@ -236,6 +236,16 @@ public partial class Nomina_Nomina2 : ClsPaginas
set { ViewState["CveTipoTrabajador"] = value; }
}
protected int posconceptospersonalizar
{
get
{
if (ViewState["posconceptospersonalizar"] == null) { return 0; }
else { return ViewState["posconceptospersonalizar"].ToString().ToEntero(); }
}
set { ViewState["posconceptospersonalizar"] = value; }
}
protected int CvePeriodoSeleccionado
{
@@ -4140,6 +4150,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
periodo = 20000101;
LimpiarFonacot();
using (ClsNominas ObjMovt = new ClsNominas())
{
ObjMovt.GetFonacotSaldos(UsuarioActual.CveEmpresa, SRCvePersonal, CveFonacot);
GVFonacotDetalle.DataSource = ObjMovt.DtResultados;
GVFonacotDetalle.DataBind();
}
TxtFonValor.Text = importeFijo.ToString();
TxtFonImporteCredito.Text = importeCredito.ToString();
TxtFonPagosHechos.Text = pagosHechos.ToString();
@@ -4944,12 +4960,13 @@ public partial class Nomina_Nomina2 : ClsPaginas
addcoltopersonalizar("Sueldo diario", "0", "", "");
addcoltopersonalizar("Dias Pen Pago", "0", "", "");
int pos = 4;
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))
{
addcoltopersonalizar(row["Concepto"].ToString(), "1", string.Format("[V_{0}]", row["CveConcepto"].ToString()), row["Codigo"].ToString());
pos = pos + 1;
}
}
@@ -4968,7 +4985,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
//addcoltopersonalizar("Deducciones", "1", "Deducciones", "");
addcoltopersonalizar("Neto a Pagar", "1", "Total", "");
posconceptospersonalizar = pos;
//foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'O' AND EsPadre = 1 AND EsFormula =0").Rows)//EsFormula =0
//{
@@ -5010,7 +5027,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
drorden["Tipo"] = "0";
drorden["ColumnaDB"] = DdlMOPXColumna.SelectedItem.Value;
//drorden["TipoDB"] = DdlMOTipo.SelectedItem.Value;
DtNomPersonalizarxls.Rows.Add(drorden);
DtNomPersonalizarxls.Rows.InsertAt(drorden, posconceptospersonalizar);
}
GvPersonalizarExcel.DataSource = DtNomPersonalizarxls;
@@ -5106,7 +5123,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
ClosedXML.Excel.XLColor colororange = ClosedXML.Excel.XLColor.FromArgb(247, 150, 70);
ClosedXML.Excel.XLColor colororangeblue = ClosedXML.Excel.XLColor.FromArgb(79, 129, 189);
ClosedXML.Excel.IXLCell celda;
DataTable dtConceptos = this.dtConceptos.FiltraParametros("(Tipo ='P' AND EsPadre = 1 AND EsFormula =0) OR (Tipo = 'D' AND EsPadre = 1 AND EsFormula =0) OR Tipo = 'O' AND EsPadre = 1 AND EsFormula =0");
DataTable dtConceptos = this.dtConceptos.FiltraParametros("");
DataTable dtFiltrado = dtConceptos.Clone(); // Clonar la estructura del DataTable
foreach (GridViewRow row in GvPersonalizarExcel.Rows)
@@ -5199,7 +5216,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
int finPercepciones = iniciotipe;
column++;
TitleRange(libro, "Incapacidad", filainicio + 2, column, filainicio + 2, column+2, false, false, PercborderColor);
TitleRange(libro, "Incapacidad", filainicio + 2, column, filainicio + 2, column, false, false, PercborderColor);
TitleRange(libro, "Perm. Faltas", filainicio + 3, column, filainicio + 3, column, false, false, PercborderColor);
//column++;
//TitleRange(libro, "Permisos", filainicio + 3, column, filainicio + 3, column, false, false, colororangeblue);
@@ -5356,6 +5373,10 @@ public partial class Nomina_Nomina2 : ClsPaginas
column++;
libro.Cell(Fila, column).Value = "";
try{libro.Cell(Fila, column).Value = erow[string.Format("V_{0}", 6817)];
libro.Cell(Fila, column).Style.NumberFormat.Format = "#,##0.00;-#,##0.00;\"\"";
}
catch (Exception) { }
column++;
libro.Cell(Fila, column).Value = erow["SalarioDiario"];
@@ -9571,14 +9592,14 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
}
pdf = GeneraPDFNomina(CvePersonal, CvePeriodo, UsuarioActual.CveEmpresa, UsuarioActual.Empresa.Ruta);
if (confiniquito)
{
List<byte[]> pdfs = new List<byte[]>();
pdfs.Add(pdf);
pdfs.Add(GeneraPDFNomina(CvePersonal, CvePeriodo, UsuarioActual.CveEmpresa, UsuarioActual.Empresa.Ruta, true));
pdf = MergeFiles(pdfs);
//if (confiniquito)
//{
// List<byte[]> pdfs = new List<byte[]>();
// pdfs.Add(pdf);
// pdfs.Add(GeneraPDFNomina(CvePersonal, CvePeriodo, UsuarioActual.CveEmpresa, UsuarioActual.Empresa.Ruta, true));
// pdf = MergeFiles(pdfs);
}
//}
}
else
{