From 20d1fd4dae608aabcc908abd29036fb9cc58abcc Mon Sep 17 00:00:00 2001 From: Rakcsle Supertramp Date: Fri, 10 Jan 2020 12:43:38 -0700 Subject: [PATCH 1/9] Correciones iva 6% --- Compras/Compras.aspx | 6 ++++-- Compras/Compras.aspx.vb | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Compras/Compras.aspx b/Compras/Compras.aspx index 40e4e3811..e79fadb0c 100644 --- a/Compras/Compras.aspx +++ b/Compras/Compras.aspx @@ -907,8 +907,10 @@ - - + + + Deglose 6% + <%----%> <%-- diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb index 6d3b6c35f..9b80eb72f 100644 --- a/Compras/Compras.aspx.vb +++ b/Compras/Compras.aspx.vb @@ -2087,8 +2087,12 @@ Partial Class Compras_Compras End If DdlRetIVAConcepto.Items.Add(New ListItem("Arrendamiento", "4")) - DdlRetIVAConcepto.Items.Add(New ListItem("Ret IVA Servicios", "5")) - + + If UsuarioActual.Empresa.Funcionalidad(577).ToEntero = 1 Then + DdlRetIVAConcepto.Items.Add(New ListItem("Ret IVA Servicios", "5")) + End If + + End If @@ -19300,7 +19304,7 @@ Partial Class Compras_Compras DdlRetIVAConcepto.SelectedValueExist("5") - LblRetIVA.Text = "0.06%" + LblRetIVA.Text = "6.0%" RetencionIVA = TmpDT.SUMD("RetIVA") TxtRetIVA.Text = RetencionIVA.ToString("###,###,###.00") From a995208e9946d1ac72f11412b4957c9b84d9009b Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Mon, 13 Jan 2020 18:43:34 -0700 Subject: [PATCH 2/9] modales inicio --- App_Code/ClsVentas.vb | 32 +++ Inicio.aspx | 301 +++++++++++++++------- Inicio.aspx.vb | 24 +- Scripts/funciones.js | 9 +- Ventas/RepCancelacionesPorAtender.aspx.cs | 73 +++--- 5 files changed, 304 insertions(+), 135 deletions(-) diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index d5c7b5237..7c5a550f8 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -2677,6 +2677,38 @@ Public Class ClsVentas Return OnError End Function + Public Function GetFacturasCanceladasPendientesWS(RFC As String, CveEmpresa As Integer, Optional showalert As Boolean = True) As Boolean + Dim retorno As Boolean = False + Dim objServicio As Cancelacion.CancelacionSoapClient = New Cancelacion.CancelacionSoapClient() + Dim resp As Cancelacion.StructCancel = objServicio.ObtienePendientes(RFC, "UserTest", "1234567890") + If resp.Estado = 0 Then + Dim XmlPendientes As String = System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(resp.Xml)) + Dim theReader As IO.StringReader = New IO.StringReader(XmlPendientes) + Dim theDataSet As DataSet = New DataSet() + theDataSet.ReadXml(theReader) + + If theDataSet.Tables(0).Rows(0)("Uuid").ToString() <> "null" Then + Dim sb = New StringBuilder() + + For Each item As DataRow In theDataSet.Tables(0).Rows + sb.AppendFormat("{0};", item("Uuid").ToString()) + Next + + If GetFacturasCanceladasPendientes(sb.ToString(), CveEmpresa) Then + retorno = True + End If + + Else + If showalert Then + Alert("No se encontraron cancelaciones pendientes", ModExtensiones.TipoMensaje.MsgError) + End If + End If + Else + Alert("Error al obtener cancelaciones pendientes: " & resp.Descripcion, ModExtensiones.TipoMensaje.MsgError) + End If + Return retorno + End Function + Public Function UpdateVentaFacturas(CveFactura As Integer, CveVenta As Integer, CveEmpresa As Integer) As Boolean Dim OnError As Boolean = False diff --git a/Inicio.aspx b/Inicio.aspx index 390a8591e..36480761b 100644 --- a/Inicio.aspx +++ b/Inicio.aspx @@ -605,62 +605,62 @@
" style="display: inline-block; width: 150px;" /> - " style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"> + " style="margin-top: -3px; margin-left: -13px;" class="btn btn-circle btn-sm label-info">
- - - -   - - + DataKeysNames="CveVenta" + EmptyDataText="No se encontraron registros" ToolTip="Listado de Temas" + CssClass="table table-striped table-advance table-hover Widthall ScrollAD" + data-sort="true" + data-freezerows="1" + GridLines="None"> + + + +   + + - - -   - - + + +   + + - - -   - - + + +   + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - -
- -
- - + + +
+ +
+ + - - + +
@@ -674,6 +674,101 @@
+ + + + + + + + + + + + +