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
2022-06-23 07:35:13 -07:00
parent cafc67ba41 1875910bae
commit 55792ebf75
5 changed files with 85 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
App_Code/ClsNominas.vb
View File

@@ -859,7 +859,6 @@ Public Class ClsNominas
DataAdapter("PA_Nom_NominasDetallesRemove")
SqlAdapter.SelectCommand.Parameters.Add("@CveNominaDetalle", SqlDbType.Int).Value = CveNominaDetalle
Try
SqlAdapter.Fill(Data)
Retorno = True
@@ -1063,12 +1062,15 @@ Public Class ClsNominas
End Function
Public Function RemoveNom_Nominas(CveNomina As Integer) As Boolean
Public Function RemoveNom_Nominas(CveNomina As Integer, EliminarTodo As Boolean, CveUsuario As Integer) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_Nom_NominasRemove")
SqlAdapter.SelectCommand.Parameters.Add("@CveNomina", SqlDbType.Int).Value = CveNomina
'
SqlAdapter.SelectCommand.Parameters.Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
SqlAdapter.SelectCommand.Parameters.Add("@EliminarTodo", SqlDbType.Int).Value = If(EliminarTodo, 1, 0)
Try
SqlAdapter.Fill(Data)

8
Nomina/Nomina.aspx
View File

@@ -577,8 +577,9 @@
<asp:HyperLink ID="HypXml" ToolTip="Formato xml" Visible="false" CssClass="btn btn-circle btn- btn-xs blue mysmallbtn" NavigateUrl="#" runat="server"><i class="fa fa-file-o"></i></asp:HyperLink>
<asp:HyperLink ID="HypPDF" ToolTip="Formato Timbre" CssClass="btn btn-circle btn-sm btn-xs red mysmallbtn" Visible="false" NavigateUrl="#" runat="server"><i class="fa fa-file-pdf-o"></i></asp:HyperLink>
<asp:LinkButton runat="server" ID="LnkTimbrar" CssClass="btn btn-circle btn-sm btn-xs blue mysmallbtn" Text="<i class='fa fa-bell'></i>" OnClick="LnkTimbrar_Click" data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea Timbrar?" data-btn-ok-label="si" />
<asp:LinkButton runat="server" ID="Imgdesautorizar" CssClass="btn btn-circle btn-sm btn-xs yellow-gold mysmallbtn" Text="<i class='fa fa-ban'></i>" OnClick="Imgdesautorizar_Click" CommandArgument='<%# Eval("CveNomina") %>' Visible='<%# (Eval("CveNomina").ToString() != "" && Eval("SeTimbro").ToString() == "False"? true :false)%>' data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea eliminar la autorizacion?" data-btn-ok-label="si" />
<asp:LinkButton runat="server" ID="ImgDelete" CssClass="btn btn-circle btn-sm btn-xs red mysmallbtn" Text="<i class='icon-trash'></i>" OnClick="ImgDelete_Click" CommandArgument='<%# Eval("CveNomina") %>' Visible='<%# (Eval("CveNomina").ToString() != "" && Eval("SeTimbro").ToString() == "False"? true :false)%>' data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea eliminar la nómina?" data-btn-ok-label="si" />
<asp:LinkButton runat="server" ID="LnkCancelar" CssClass="btn btn-circle btn-sm btn-xs red mysmallbtn" Text="<i class='fa fa-ban'></i>" OnClick="LnkCancelar_Click" CommandArgument='<%# Eval("CveNomina") %>' Visible='<%# (Eval("CveNomina").ToString() != "" && PermisoCancelarEmitido && Eval("SeTimbro").ToString() == "True"? true :false)%>' data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea cancelar la nómina?" data-btn-ok-label="si" />
<asp:LinkButton runat="server" ID="LnkCancelar" CssClass="btn btn-circle btn-sm btn-xs yellow-gold mysmallbtn" Text="<i class='fa fa-ban'></i>" OnClick="LnkCancelar_Click" CommandArgument='<%# Eval("CveNomina") %>' Visible='<%# (Eval("CveNomina").ToString() != "" && PermisoCancelarEmitido && Eval("SeTimbro").ToString() == "True"? true :false)%>' data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea cancelar la nómina?" data-btn-ok-label="si" />
</div>
</ItemTemplate>
</asp:TemplateField>
@@ -871,6 +872,9 @@
</div>
<div class="actions">
<div class="btn-group">
<asp:LinkButton ID="LnkMostrarocultarConceptos" CssClass="btn yellow-gold" OnClick="LnkMostrarocultarConceptos_Click" runat="server">Mostrar/ocultar</asp:LinkButton>
</div>
<div class="btn-group">
<a onclick="$('#C_BtnImprimirsobrerecibo').click()" class="btn yellow-gold">Imprimir</a>
</div>
@@ -939,7 +943,7 @@
</asp:TemplateField>
<asp:TemplateField HeaderText="Importe">
<ItemTemplate>
<asp:Label ID="LtlImporteD" runat="server" Text='<%# Eval("ImporteD", "${0:N}") %>' Style="word-break: break-all; display: inline-block;"></asp:Label>
<asp:Label ID="LtlImporteD" runat="server" Text='<%# string.Format("{0}{1}",(Eval("CveSistemaD").ToString()=="20"? "-" :""),Eval("ImporteD", "${0:N}")) %>' Style="word-break: break-all; display: inline-block;"></asp:Label>
<asp:LinkButton ID="LnkImporteD" OnClick="LnkConcepto_Click" runat="server"></asp:LinkButton>
<div style="display: inline-block; width: 29px;">
<asp:LinkButton ID="LnkImporteDxCalculo" OnClick="LnkImportexCalculo_Click" runat="server" CssClass="btn btn-circle btn-sm btn-xs btn-xs red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea eliminar el importe fijo?" data-btn-ok-label="si"></asp:LinkButton>

85
Nomina/Nomina.aspx.cs
View File

@@ -1339,6 +1339,32 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
}
protected void Imgdesautorizar_Click(object sender, EventArgs e)
{
int Cve = ((LinkButton)sender).CommandArgument.ToEntero();
//LinkButton lnk = (LinkButton)sender;
//GridViewRow gvRow = (GridViewRow)lnk.NamingContainer;
//int CvePeriodo = gvRow.DataKey("CvePeriodo").ToEntero();
//int CvePersonal = gvRow.DataKey("CvePersonal").ToEntero();
bool continuar = true;
using (ClsNominas Nom = new ClsNominas())
{
Nom.IniciaTransacSQL();
//AutorizaNom_Nominas
if (continuar && (continuar = Nom.RemoveNom_Nominas(Cve,false, UsuarioActual.CveUsuario)))
{
Nom.Commit();
}
}
if (continuar)
{
Alert("La nomina a sido desautorizada", TipoMensaje.MsgInformacion);
cargaDatos();
}
}
protected void ImgDelete_Click(object sender, EventArgs e)
{
int Cve = ((LinkButton)sender).CommandArgument.ToEntero();
@@ -1352,7 +1378,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
{
Nom.IniciaTransacSQL();
//AutorizaNom_Nominas
if (continuar && (continuar = Nom.RemoveNom_Nominas(Cve)))
if (continuar && (continuar = Nom.RemoveNom_Nominas(Cve,true,UsuarioActual.CveUsuario )))
{
Nom.Commit();
@@ -2005,7 +2031,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
cargaDatos();
cargaBitacora();
cargasobrericiboconceptos();
cargasobrericiboconceptos(SRMostrarFormulas);
UpModalConceptos.Update();
}
protected void cargaasistenciaSR(string orden = "")
@@ -2705,7 +2731,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
{
cargaDatos();
cargasobrericiboconceptos();
cargasobrericiboconceptos(SRMostrarFormulas);
UpModalConceptos.Update();
RegistraScript("$('#ModalUpConcepto').modal('hide');");
@@ -2952,7 +2978,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
cargaDatos();
cargaBitacora();
cargasobrericiboconceptos();
cargasobrericiboconceptos(SRMostrarFormulas);
UpModalConceptos.Update();
RegistraScript("$('#ModalUpConcepto').modal('hide');");
@@ -3048,7 +3074,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
LblSRSbc.Text = SalarioDiarioIMSS;
#endregion
cargasobrericiboconceptos();
cargasobrericiboconceptos(true);
CargaFonacot();
#region "Infonavit"
{
@@ -3225,12 +3251,26 @@ public partial class Nomina_Nomina2 : ClsPaginas
#endregion
public void cargasobrericiboconceptos()
protected void LnkMostrarocultarConceptos_Click(object sender, EventArgs e)
{
cargasobrericiboconceptos(!SRMostrarFormulas);
}
protected bool SRMostrarFormulas
{
get
{
DataTable dtper = dtConceptos.FiltraParametros("Tipo IN ('P') AND EsPadre = 1 ");
DataTable dtded = dtConceptos.FiltraParametros("Tipo IN ('D') AND EsPadre = 1 AND CveSistema NOT IN(101)");
if (ViewState["SRMostrarFormulas"] == null) { return false; }
else { return (bool)ViewState["SRMostrarFormulas"]; }
}
set { ViewState["SRMostrarFormulas"] = value; }
}
public void cargasobrericiboconceptos(Boolean MostrarFormulas )
{
SRMostrarFormulas = MostrarFormulas;
{
DataTable dtper = dtConceptos.FiltraParametros(string.Format("Tipo IN ('P') AND EsPadre = 1 {0}",(MostrarFormulas?"": " AND SoloVisible=0")));
DataTable dtded = dtConceptos.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));
@@ -3391,6 +3431,9 @@ public partial class Nomina_Nomina2 : ClsPaginas
nConcepto.ConceptoP = Concepto;
nConcepto.NoConceptoP = Codigo;
nConcepto.ImporteP = Importe;
nConcepto.isOnlyBisibleP = row["SoloVisible"].ToString().ToEntero();
nConcepto.CveSistemaP = row["CveSistema"].ToString().ToEntero();
nConcepto.ValorP = dtempleados.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
}
if (maxded > i)
@@ -3405,6 +3448,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
nConcepto.ConceptoD = Concepto;
nConcepto.NoConceptoD = Codigo;
nConcepto.ImporteD = Importe;
nConcepto.CveSistemaD = row["CveSistema"].ToString().ToEntero();
nConcepto.isOnlyBisibleD = row["SoloVisible"].ToString().ToEntero();
nConcepto.ValorD = dtempleados.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
}
lconc.Add(nConcepto);
@@ -3452,6 +3497,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
dtCon.Columns.Add(new DataColumn("EstatusD", typeof(int)));
dtCon.Columns.Add(new DataColumn("isEditedD", typeof(int)));
dtCon.Columns.Add(new DataColumn("isOnlyBisibleD", typeof(int)));
dtCon.Columns.Add(new DataColumn("CveSistemaD", typeof(int)));
dtCon.Columns.Add(new DataColumn("CveSistemaP", typeof(int)));
foreach (NConcepto itc in lconc)
{
DataRow dr = dtCon.NewRow();
@@ -3473,6 +3520,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
dr["EstatusD"] = itc.EstatusD;
dr["isEditedD"] = itc.isEditedD;
dr["isOnlyBisibleD"] = itc.isOnlyBisibleD;
dr["CveSistemaD"] = itc.CveSistemaD;
dr["CveSistemaP"] = itc.CveSistemaP;
dtCon.Rows.Add(dr);
}
dtCon.AcceptChanges();
@@ -3555,7 +3604,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
urlfile = System.IO.Path.Combine(ModExtensiones.DirectorioBaseEmpresas, "Empresas/Grales/Formatos/SobreRecibo.rdlc");
}
ImprimirPDF(urlfile, lrds, parametros, "SobreRecibo", "PDF", null, Content_Disposition: "Inline");
ImprimirPDF(urlfile, lrds, parametros, "SobreRecibo", "PDF", null);
}
protected void BtnGuardarInfornavit_Click(object sender, EventArgs e)
{
@@ -3598,6 +3647,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
public int isSavedP { get; set; }
public int isEditedP { get; set; }
public int isOnlyBisibleP { get; set; }
public int CveSistemaP { get; set; }
public string NoConceptoD { get; set; }
@@ -3610,7 +3660,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
public int isSavedD { get; set; }
public int isEditedD { get; set; }
public int isOnlyBisibleD { get; set; }
public int CveSistemaD { get; set; }
@@ -3624,6 +3675,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
public int EstatusO { get; set; }
public int isEditedO { get; set; }
public int isOnlyBisibleO { get; set; }
public int CveSistemaO { get; set; }
}
int CveConceptoPolgvc, CveConceptoDolgvc;
@@ -5918,7 +5970,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
//AutorizaNom_Nominas
foreach (DataRow drow in dtr.Rows)
{
if (continuar && (continuar = Nom.RemoveNom_Nominas(drow["CveNomina"].ToString().ToEntero())))
if (continuar && (continuar = Nom.RemoveNom_Nominas(drow["CveNomina"].ToString().ToEntero(),false,UsuarioActual.CveUsuario)))
{
}
@@ -6530,6 +6582,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
nConcepto.ConceptoP = Concepto;
nConcepto.NoConceptoP = Codigo;
nConcepto.ImporteP = Importe;
nConcepto.CveSistemaP = row["CveSistema"].ToString().ToEntero();
nConcepto.ValorP = dtempleadosSimula.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
}
if (maxded > i)
@@ -6544,6 +6597,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
nConcepto.ConceptoD = Concepto;
nConcepto.NoConceptoD = Codigo;
nConcepto.ImporteD = Importe;
nConcepto.CveSistemaD = row["CveSistema"].ToString().ToEntero();
nConcepto.ValorD = dtempleadosSimula.SUM(string.Format("[VAL_{0}]", CveConcepto), string.Format("CvePersonal = {0}", SRCvePersonal));
}
lconc.Add(nConcepto);
@@ -6591,6 +6645,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
dtCon.Columns.Add(new DataColumn("EstatusD", typeof(int)));
dtCon.Columns.Add(new DataColumn("isEditedD", typeof(int)));
dtCon.Columns.Add(new DataColumn("isOnlyBisibleD", typeof(int)));
dtCon.Columns.Add(new DataColumn("CveSistemaD", typeof(int)));
dtCon.Columns.Add(new DataColumn("CveSistemaP", typeof(int)));
foreach (NConcepto itc in lconc)
{
DataRow dr = dtCon.NewRow();
@@ -6612,6 +6668,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
dr["EstatusD"] = itc.EstatusD;
dr["isEditedD"] = itc.isEditedD;
dr["isOnlyBisibleD"] = itc.isOnlyBisibleD;
dr["CveSistemaD"] = itc.CveSistemaD;
dr["CveSistemaP"] = itc.CveSistemaP;
dtCon.Rows.Add(dr);
}
dtCon.AcceptChanges();
@@ -6686,7 +6744,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
urlfile = System.IO.Path.Combine(ModExtensiones.DirectorioBaseEmpresas, "Empresas/Grales/Formatos/SobreRecibo.rdlc");
}
ImprimirPDF(urlfile, lrds, parametros, "SobreRecibo", "PDF", null, Content_Disposition: "Inline");
ImprimirPDF(urlfile, lrds, parametros, "SobreRecibo", "PDF", null);
}
protected void DdlTipoPeriodoSim_SelectedIndexChanged(object sender, EventArgs e)
{
@@ -8589,4 +8647,5 @@ public partial class Nomina_Nomina2 : ClsPaginas
#endregion
}

1
Ventas/Ventas.aspx.vb
View File

@@ -2630,6 +2630,7 @@ Partial Class Ventas
End If
If Request("CveEmbarqueManifiesto") IsNot Nothing AndAlso IsNumeric(Request("CveEmbarqueManifiesto")) AndAlso Request("CveEmbarqueManifiesto").ToEntero() > 0 Then
DdlMoneda.SelectedValueExist(2)
CambiaMoneda()
Using ObjVentas As New ClsNominas
If ObjVentas.EmbarqueManifiestoGet(-1, -1, -1, Request("CveEmbarqueManifiesto").ToString().ToEntero()) And ObjVentas.DtResultados.Rows.Count > 0 Then
DdlSubProyectoDatos.SelectedValueExist(ObjVentas.DtResultados.Rows(0)("CveSubProyecto").ToString())

2
vwd.webinfo
View File

@@ -508,6 +508,8 @@