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

Merge branch 'master' of http://rpimienta@192.168.10.111:8383/SIG.git

Browse Source
This commit is contained in:
Raul Pimienta
2019-09-10 17:14:58 -07:00
parent 4895cb99e6 8b6d677c63
commit 747d05ce47
27 changed files with 3479 additions and 2878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Ventas/ProductosServicios.aspx.vb
View File

@@ -367,14 +367,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

2
Ventas/RepCancelacionesPorRespuesta.aspx.cs
View File

@@ -50,7 +50,7 @@ public partial class Ventas_RepCancelacionesPorRespuesta : ClsPaginas
}
ObjVentas.Dispose();
GvDatos.DataSource = DtVentas.FiltraParametros("CveEstatusFactura = 20 AND CveEstatusRefacturacion = 0");
var DtRefacturar = DtVentas.FiltraParametros("CveEstatusRefacturacion = 1");
var DtRefacturar = DtVentas.FiltraParametros("CveEstatusRefacturacion IN (1,3)");
if (DtRefacturar.Rows.Count > 0)
{
DivRefacturar.Visible = true;

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)

2
Ventas/Ventas.aspx.vb
View File

@@ -15532,7 +15532,7 @@ Partial Class Ventas
CancelarDocumento(True)
End Sub
Private Sub BtnRefacturacionConfirmarAceptacion_Click(sender As Object, e As System.EventArgs) Handles BtnRefacturacionConfirmarAceptacion.Click
Response.Redirect(String.Format("Ventas.aspx?CveDevolucion={0}&NuevaFactura=1", CveVenta))
CancelarDocumento(True)
End Sub
Private Sub BtnContabilizar_Click(sender As Object, e As System.EventArgs) Handles BtnContabilizar.Click
'Dim ObjMov As New ClsContabilidad