AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nominas

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2019-09-10 04:22:04 -07:00
parent c2768117ed
commit 2c478bfa1d
13 changed files with 876 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Ventas/ProductosServicios.aspx
View File

@@ -936,46 +936,45 @@
</div>
</div>
<br />
<div class="row">
<asp:UpdatePanel ID="UpSeccionAlmacen" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<div class="col-md-12" id="DivSeccionAlmacen" runat="server" visible="false">
<div class="portlet xspadding light bordered">
<div class="portlet-title">
<div class="caption font-green">
<i class="icon-briefcase font-green"></i>
<span class="caption-subject bold uppercase">Secciones de Almacen</span>
</div>
<div class="actions">
<div class="btn-group">
<asp:LinkButton ID="LnkSeccionAlmacenAdd" OnClick="LnkSeccionAlmacenAdd_Click" runat="server" data-toggle="tooltip" data-placement="right" title="Agregar Seccion de Almacen" CssClass="btn btn-circle btn-default" Text="<i class='fa fa-plus'></i> Agregar"></asp:LinkButton>
</div>
</div>
<asp:UpdatePanel ID="UpSeccionAlmacen" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<div id="DivSeccionAlmacen" runat="server" visible="false">
<div class="portlet xspadding light bordered">
<div class="portlet-title">
<div class="caption font-green">
<i class="icon-briefcase font-green"></i>
<span class="caption-subject bold uppercase">Secciones de Almacen</span>
</div>
<div class="portlet-body">
<asp:GridView ID="GvSeccionAlmacen" runat="server" AutoGenerateColumns="False" DataKeyNames="CvePSAlmacenSeccion,CvePS,CveAlmacen,CveAlmacenSeccion" EmptyDataText="No se encontraron Productos/Servicios Adicionales" CssClass="table table-striped table-hover Widthall ScrollAD mysmallbtn" GridLines="None">
<Columns>
<asp:BoundField DataField="Almacen" HeaderText="Almacen" ItemStyle-HorizontalAlign="Left" />
<asp:BoundField DataField="AlmacenSeccion" HeaderText="Sección Almacen" ItemStyle-HorizontalAlign="Left" />
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Editar">
<ItemTemplate>
<asp:LinkButton ID="LnkEditarSeccionAlmacen" runat="server" AlternateText="Editar" CausesValidation="False" OnClick="LnkEditarSeccionAlmacen_Click" CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-pencil'></i>" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Eliminar">
<ItemTemplate>
<asp:LinkButton ID="LnkRemoveSeccionAlmacen" runat="server" AlternateText="Eliminar" CausesValidation="False" OnClick="LnkRemoveSeccionAlmacen_Click" CssClass="btn btn-circle btn-xs red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="confirmar" data-btn-ok-label="si" />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<div class="actions">
<div class="btn-group">
<asp:LinkButton ID="LnkSeccionAlmacenAdd" OnClick="LnkSeccionAlmacenAdd_Click" runat="server" data-toggle="tooltip" data-placement="right" title="Agregar Seccion de Almacen" CssClass="btn btn-circle btn-default" Text="<i class='fa fa-plus'></i> Agregar"></asp:LinkButton>
</div>
</div>
</div>
<div class="portlet-body">
<asp:GridView ID="GvSeccionAlmacen" runat="server" AutoGenerateColumns="False" DataKeyNames="CvePSAlmacenSeccion,CvePS,CveAlmacen,CveAlmacenSeccion" EmptyDataText="No se encontraron Productos/Servicios Adicionales" CssClass="table table-striped table-hover Widthall ScrollAD mysmallbtn" GridLines="None">
<Columns>
<asp:BoundField DataField="Almacen" HeaderText="Almacen" ItemStyle-HorizontalAlign="Left" />
<asp:BoundField DataField="AlmacenSeccion" HeaderText="Sección Almacen" ItemStyle-HorizontalAlign="Left" />
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Editar">
<ItemTemplate>
<asp:LinkButton ID="LnkEditarSeccionAlmacen" runat="server" AlternateText="Editar" CausesValidation="False" OnClick="LnkEditarSeccionAlmacen_Click" CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-pencil'></i>" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Eliminar">
<ItemTemplate>
<asp:LinkButton ID="LnkRemoveSeccionAlmacen" runat="server" AlternateText="Eliminar" CausesValidation="False" OnClick="LnkRemoveSeccionAlmacen_Click" CssClass="btn btn-circle btn-xs red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="confirmar" data-btn-ok-label="si" />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
</ContentTemplate>
</ajax:TabPanel>

12
Ventas/ProductosServicios.aspx.vb
View File

@@ -368,14 +368,10 @@ Partial Class ProductosyServicios
End Sub
Private Sub PresionarBotonPanel(Boton As String)
Try
Dim Script As String = $"document.getElementById(""{Boton}"").click();"
Dim Pag As System.Web.UI.Page = CType(System.Web.HttpContext.Current.Handler, System.Web.UI.Page)
ScriptManager.RegisterStartupScript(Pag, Pag.GetType(), Boton, Script, True)
Pag = Nothing
Catch ex As Exception
Throw
End Try
Dim Script As String = $"document.getElementById(""{Boton}"").click();"
Dim Pag As System.Web.UI.Page = CType(System.Web.HttpContext.Current.Handler, System.Web.UI.Page)
ScriptManager.RegisterStartupScript(Pag, Pag.GetType(), Boton, Script, True)
Pag = Nothing
End Sub
#End Region

8
Ventas/RepConciliacionEmitidosSat.aspx.cs
View File

@@ -97,14 +97,18 @@ public partial class Ventas_RepConciliacionEmitidosSat : ClsPaginas
ClsAcumuladores ObjAcum = new ClsAcumuladores(ObjVentas.IniciaTransacSQL());
ClsContPAQi ObjContPaq = null;
//StringBuilder MensajeAlert = new StringBuilder() ;
DataTable DtDetalle = objfact.DtDetalle;
try
{
objfact.GuardarVenta(ref objfact, ref ObjVentas, ref ObjConta, ref ObjInventario, ref ObjContr, ref objfact.DtDetalle, objfact.CveNCaVincular, ref ObjContPaq, ref ObjBancos, ref ObjOS, ref ObjEventos, ref ObjCGame, ref ObjClientes, ObjAcum: ObjAcum);
objfact.GuardarVenta(ref objfact, ref ObjVentas, ref ObjConta, ref ObjInventario, ref ObjContr, ref DtDetalle, objfact.CveNCaVincular, ref ObjContPaq, ref ObjBancos, ref ObjOS, ref ObjEventos, ref ObjCGame, ref ObjClientes, ObjAcum: ObjAcum);
}
catch (Exception)
catch (Exception e)
{
objfact.CveVenta = -1;
e.ToString().GuardaLog();
strErrores.AppendLine("<br/>");
strErrores.AppendLine(e.ToString());
}
if (ObjVentas.UpdateEstatusFactura(3, objxml.complemento.UUID, "", DateTime.ParseExact(objxml.comprobante.Fecha.Replace("T", " "), "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture), ObjVentas.CveVenta, CvePAC: 4))
if (objfact.CveVenta > 0 && objfact.ErrorList.Count == 0)