From 272eea922ac9ad94c0a19cfe4b7154dd0b93a744 Mon Sep 17 00:00:00 2001 From: Oscar Irigoyen Date: Mon, 10 Oct 2022 19:08:20 -0700 Subject: [PATCH 1/3] Compras, SaldosIniciales --- Compras/Compras.aspx | 3 +- Compras/Compras.aspx.vb | 184 +- Contabilidad2/RepAnexoCatalogoCC.aspx | 304 +- Empresas/1/Formatos/100.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/1066.xlsm | Bin 20945 -> 0 bytes Empresas/1/Formatos/1123.xlsm | Bin 20945 -> 0 bytes Empresas/1/Formatos/17824.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/17843.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/17844.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/17845.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/18843.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/18856.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/19873.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/19874.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/21852.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/21853.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/22990.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/22994.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/22995.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/22996.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/22997.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/23843.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/23844.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/23845.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/23847.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/23848.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/23850.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/24843.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/24_Documentacion.docx | Bin 12256 -> 0 bytes Empresas/1/Formatos/25413.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/9745.xlsm | Bin 81595 -> 0 bytes Empresas/1/Formatos/9746.xlsm | Bin 81595 -> 0 bytes Empresas/1/Formatos/9748.xlsm | Bin 81595 -> 0 bytes Empresas/1/Formatos/Cheque.xlsm | Bin 17860 -> 0 bytes Empresas/1/Formatos/Cotizacion.rdlc | 3806 +++---- .../1/Formatos/DocumentoEntregasForaneas.docx | Bin 41273 -> 0 bytes Empresas/1/Formatos/Factura.rdlc | 9935 ++++++----------- Empresas/1/Formatos/Factura.xlsm | Bin 81403 -> 0 bytes Empresas/1/Formatos/Formato (E.xlsx | Bin 60416 -> 0 bytes Empresas/1/Formatos/Formato - copia(E.xlsx | Bin 35971 -> 0 bytes .../1/Formatos/Formato - copiakarnes (E.xlsx | Bin 46821 -> 0 bytes ...ato1 -BUENAAA - copia - copia - copia.xlsm | Bin 39581 -> 0 bytes Empresas/1/Formatos/Formato1.xlsm | Bin 113487 -> 0 bytes Empresas/1/Formatos/Formato1VSH.xlsm | Bin 124630 -> 0 bytes Empresas/1/Formatos/Formato2.xlsm | Bin 75962 -> 0 bytes Empresas/1/Formatos/Guaymas.xlsm | Bin 81639 -> 0 bytes Empresas/1/Formatos/HMO.xlsm | Bin 42074 -> 0 bytes Empresas/1/Formatos/HMOCot.xlsm | Bin 48280 -> 0 bytes Empresas/1/Formatos/HMOEgs.xlsm | Bin 48280 -> 0 bytes Empresas/1/Formatos/Nomina.xlsm | Bin 92281 -> 0 bytes Empresas/1/Formatos/OC.rdlc | 4337 +++---- Empresas/1/Formatos/OrdenCompra.xlsm | Bin 45122 -> 0 bytes Empresas/1/Formatos/OrdenServicio.xlsm | Bin 20945 -> 0 bytes Empresas/1/Formatos/Poliza.xlsm | Bin 10355 -> 0 bytes Empresas/1/Formatos/Poliza_16.pdf | Bin 210248 -> 0 bytes Empresas/1/Formatos/Poliza_16.xlsm | Bin 15765 -> 0 bytes Empresas/1/Formatos/Poliza_17.pdf | Bin 207104 -> 0 bytes Empresas/1/Formatos/Poliza_17.xlsm | Bin 15735 -> 0 bytes Empresas/1/Formatos/Poliza_68.pdf | Bin 213508 -> 0 bytes Empresas/1/Formatos/Presupuesto.xlsm | Bin 45122 -> 0 bytes Empresas/1/Formatos/ReciboDePago.rdlc | 8168 +++++++++++--- Empresas/1/Formatos/RepTrasladoSolicitud.rdlc | 3539 ------ Empresas/1/Formatos/ResguardoAF.rdlc | 973 -- Empresas/1/Formatos/ResguardoAF2.rdlc | 1057 -- Empresas/1/Formatos/Traspaso.rdlc | 2319 ---- .../SaldosIniciales/FormatoProveedor.xlsx | Bin 9215 -> 9327 bytes General/SaldosIniciales.aspx.vb | 169 +- 67 files changed, 14552 insertions(+), 20242 deletions(-) delete mode 100644 Empresas/1/Formatos/100.xlsm delete mode 100644 Empresas/1/Formatos/1066.xlsm delete mode 100644 Empresas/1/Formatos/1123.xlsm delete mode 100644 Empresas/1/Formatos/17824.xlsm delete mode 100644 Empresas/1/Formatos/17843.xlsm delete mode 100644 Empresas/1/Formatos/17844.xlsm delete mode 100644 Empresas/1/Formatos/17845.xlsm delete mode 100644 Empresas/1/Formatos/18843.xlsm delete mode 100644 Empresas/1/Formatos/18856.xlsm delete mode 100644 Empresas/1/Formatos/19873.xlsm delete mode 100644 Empresas/1/Formatos/19874.xlsm delete mode 100644 Empresas/1/Formatos/21852.xlsm delete mode 100644 Empresas/1/Formatos/21853.xlsm delete mode 100644 Empresas/1/Formatos/22990.xlsm delete mode 100644 Empresas/1/Formatos/22994.xlsm delete mode 100644 Empresas/1/Formatos/22995.xlsm delete mode 100644 Empresas/1/Formatos/22996.xlsm delete mode 100644 Empresas/1/Formatos/22997.xlsm delete mode 100644 Empresas/1/Formatos/23843.xlsm delete mode 100644 Empresas/1/Formatos/23844.xlsm delete mode 100644 Empresas/1/Formatos/23845.xlsm delete mode 100644 Empresas/1/Formatos/23847.xlsm delete mode 100644 Empresas/1/Formatos/23848.xlsm delete mode 100644 Empresas/1/Formatos/23850.xlsm delete mode 100644 Empresas/1/Formatos/24843.xlsm delete mode 100644 Empresas/1/Formatos/24_Documentacion.docx delete mode 100644 Empresas/1/Formatos/25413.xlsm delete mode 100644 Empresas/1/Formatos/9745.xlsm delete mode 100644 Empresas/1/Formatos/9746.xlsm delete mode 100644 Empresas/1/Formatos/9748.xlsm delete mode 100644 Empresas/1/Formatos/Cheque.xlsm delete mode 100644 Empresas/1/Formatos/DocumentoEntregasForaneas.docx delete mode 100644 Empresas/1/Formatos/Factura.xlsm delete mode 100644 Empresas/1/Formatos/Formato (E.xlsx delete mode 100644 Empresas/1/Formatos/Formato - copia(E.xlsx delete mode 100644 Empresas/1/Formatos/Formato - copiakarnes (E.xlsx delete mode 100644 Empresas/1/Formatos/Formato1 -BUENAAA - copia - copia - copia.xlsm delete mode 100644 Empresas/1/Formatos/Formato1.xlsm delete mode 100644 Empresas/1/Formatos/Formato1VSH.xlsm delete mode 100644 Empresas/1/Formatos/Formato2.xlsm delete mode 100644 Empresas/1/Formatos/Guaymas.xlsm delete mode 100644 Empresas/1/Formatos/HMO.xlsm delete mode 100644 Empresas/1/Formatos/HMOCot.xlsm delete mode 100644 Empresas/1/Formatos/HMOEgs.xlsm delete mode 100644 Empresas/1/Formatos/Nomina.xlsm delete mode 100644 Empresas/1/Formatos/OrdenCompra.xlsm delete mode 100644 Empresas/1/Formatos/OrdenServicio.xlsm delete mode 100644 Empresas/1/Formatos/Poliza.xlsm delete mode 100644 Empresas/1/Formatos/Poliza_16.pdf delete mode 100644 Empresas/1/Formatos/Poliza_16.xlsm delete mode 100644 Empresas/1/Formatos/Poliza_17.pdf delete mode 100644 Empresas/1/Formatos/Poliza_17.xlsm delete mode 100644 Empresas/1/Formatos/Poliza_68.pdf delete mode 100644 Empresas/1/Formatos/Presupuesto.xlsm delete mode 100644 Empresas/1/Formatos/RepTrasladoSolicitud.rdlc delete mode 100644 Empresas/1/Formatos/ResguardoAF.rdlc delete mode 100644 Empresas/1/Formatos/ResguardoAF2.rdlc delete mode 100644 Empresas/1/Formatos/Traspaso.rdlc diff --git a/Compras/Compras.aspx b/Compras/Compras.aspx index 960072f71..7863393bd 100644 --- a/Compras/Compras.aspx +++ b/Compras/Compras.aspx @@ -4831,7 +4831,8 @@
- + diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb index a7606a5b8..3d1d5103e 100644 --- a/Compras/Compras.aspx.vb +++ b/Compras/Compras.aspx.vb @@ -1,5 +1,6 @@ Option Explicit On Option Strict On +Imports System.Activities Imports System.Data Imports System.Diagnostics Imports System.Globalization @@ -1151,6 +1152,21 @@ Partial Class Compras_Compras End Property + Private Property UUIDSList As List(Of String) + Get + + If ViewState("UUIDSList") Is Nothing Then + Return New List(Of String) + Else + Return DirectCast(ViewState("UUIDSList"), List(Of String)) + End If + + End Get + Set(value As List(Of String)) + ViewState("UUIDSList") = value + End Set + End Property + Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load If Not IsPostBack Then 'ImgBtnBuscarOC.Attributes.Add("data-toggle", "tooltip") @@ -1273,21 +1289,7 @@ Partial Class Compras_Compras TxtOC.Attributes.Add("onkeypress", "fncBuscaOC(event);") - 'If UsuarioActual.Empresa.GralSoloProyecto Then - ' LitHProyecto.Text = "Sucursal" - ' DdlSubProyecto.Items.Clear() - - - ' DdlAsignaSubProyecto.Items.Clear() - - - ' divproyecto.Visible = False - ' divasignaproyecto.Visible = False - ' DdlProyecto.Visible = False - ' DdlProyecto.Items(0).Text = "" - - 'End If If UsuarioActual.CveEmpresa = 66 And UsuarioActual.TienePermisoProceso(96) Then ChkProgramarPago.Visible = True @@ -1374,20 +1376,7 @@ Partial Class Compras_Compras CambiaEjercicioAC() End If - ' ''Fecha limite para ingreso de facturas - ''Dim DtEmpresa As DataTable = GlobalDTEmpresas(UsuarioActual.CveEmpresa) - ''If DtEmpresa.Rows.Count > 0 Then - '' Dim FechaLimite = DateSerial(DtEmpresa.Rows(0)("EjercicioActual").ToString.ToEntero, DtEmpresa.Rows(0)("PeriodoActual").ToString.ToEntero, DtEmpresa.Rows(0)("DiasPermitidos").ToString.ToEntero) - '' If Month(TxtFecha.Text.ToDate) < (Month(FechaLimite) - 1) Or (Month(TxtFecha.Text.ToDate) = (Month(FechaLimite) - 1) And Day(Date.Now) > Day(FechaLimite)) Then - '' Alert("La factura actual ya no aplica para ingresarse al sístema.", TipoMensaje.MsgAdvertencia) - '' BtnGuardar.Enabled = False - '' Else - '' Alert("En tiempo") - '' End If - ''Else - '' Alert("No se pudieron cargar los datos de la empresa", TipoMensaje.MsgAdvertencia) - ''End If - 'Carga Compra + If UsuarioActual.Empresa.Funcionalidad(123) <> "" And Not UsuarioActual.TienePermisoProceso(156) Then If Not ValidaCierrePeriodo() Then @@ -1600,6 +1589,11 @@ Partial Class Compras_Compras End If + + If DdlTipoComprobante.SelectedValue = "NC" Then + NCSeleccionFacturasRelacionadas(UUIDSList) + End If + End If 'SE OCUPAN AFUERA DEL POSTBACK ?? @@ -9599,6 +9593,28 @@ Partial Class Compras_Compras namespaces.AddNamespace("implocal", "http://www.sat.gob.mx/implocal") namespaces.AddNamespace("registrofiscal", "http://www.sat.gob.mx/registrofiscal") + + If _TipoComprobante.ToUpper = "E" And (Version = "3.3" Or Version = "4.0") Then + Dim UUIDS As String = "" + + Dim UUIDSLista As New List(Of String) + Dim nodeCFDIRelacionados As XmlNode + nodeCFDIRelacionados = XMLDoc.SelectSingleNode(String.Format("//{0}:CfdiRelacionados", Prefijo), namespaces) + + If nodeCFDIRelacionados IsNot Nothing Then + + For Each CFDIRelacionados As XmlNode In nodeCFDIRelacionados + UUIDSLista.Add("" & CFDIRelacionados.Attributes("UUID").Value.ToString & "") + Next + + End If + + UUIDSList = UUIDSLista + + End If + + + Dim node As XmlNode node = XMLDoc.SelectSingleNode(String.Format("//{0}:Emisor", Prefijo), namespaces) @@ -16214,7 +16230,7 @@ Partial Class Compras_Compras Dim NumNoDed As Integer = TmpDT.COUNT("CvePS", "NoDeducible = True ") If NumNoDed > 0 Then GvPS.Columns(11).Visible = True 'visualiza columnas de nodeducibles - If DdlTipoComprobante.SelectedValue.Contiene("NC", "DEV") Then + If DdlTipoComprobante.SelectedValue.Contiene("NC", "DEV") And CveFactura <= 0 Then InicializaAplicaNCFact() End If @@ -19980,11 +19996,121 @@ Partial Class Compras_Compras End Function + Private Sub NCSeleccionFacturasRelacionadas(UUIDSListRelacioandos As List(Of String)) + + + If UUIDSListRelacioandos.Count > 0 Then + Dim SaldoNota As Decimal = TxtTotal.Text.ToDecimal + Dim SaldoNotaPorAplicar As Decimal = SaldoNota + Dim CountAplicacion As Integer = 0 + + Dim sbNoencontrados As New StringBuilder + + + For Each UUID As String In UUIDSListRelacioandos + + UUID = UUID.ToUpper + Dim UUIDEncontrado As Boolean = False + + For Each GvRow As GridViewRow In GvFacturaNC.Rows + Dim UUIDGv As String = GvRow.DataKey("UUID").Trim.ToUpper + + + If UUID.Trim.ToUpper = GvRow.DataKey("UUID").Trim.ToUpper Then + UUIDEncontrado = True + Exit For + End If + + Next + + If Not UUIDEncontrado Then + sbNoencontrados.Append($"{UUID},") + End If + + Next + + Dim TeminarAmortizacion As Boolean = False + + For Each UUID As String In UUIDSListRelacioandos + + For Each GvRow As GridViewRow In GvFacturaNC.Rows + + If UUID.Trim.ToUpper = GvRow.DataKey("UUID").Trim.ToUpper Then + + Dim SaldoFactura As Decimal = GvRow.DataKey("Saldo").ToDecimal + + If SaldoFactura <= SaldoNotaPorAplicar Then + SaldoNotaPorAplicar = SaldoNotaPorAplicar - SaldoFactura + GvRow.FCTextBox("TxtImporte").Text = SaldoFactura.ToString("###,###,###.00") + GvRow.FCCheckBox("ChkFacturaNC").Checked = True + Else + + If SaldoFactura >= SaldoNotaPorAplicar Then + + GvRow.FCTextBox("TxtImporte").Text = SaldoNotaPorAplicar.ToString("###,###,###.00") + GvRow.FCCheckBox("ChkFacturaNC").Checked = True + SaldoNotaPorAplicar = 0 + TeminarAmortizacion = True + + Else + GvRow.FCTextBox("TxtImporte").Text = SaldoFactura.ToString("###,###,###.00") + GvRow.FCCheckBox("ChkFacturaNC").Checked = True + SaldoNotaPorAplicar = SaldoNotaPorAplicar - SaldoFactura + + TeminarAmortizacion = True + End If + End If + CountAplicacion = CountAplicacion + 1 + Exit For + End If + + + If SaldoNotaPorAplicar <= 0 Then + TeminarAmortizacion = True + Exit For + End If + + Next + + + If TeminarAmortizacion Then + Exit For + End If + + Next + + + Dim TipoMesaje As TipoMensaje = TipoMensaje.ToastInformacion + + TipoMesaje = If(sbNoencontrados.ToString.Length > 0 Or (SaldoNotaPorAplicar <> 0), TipoMensaje.ToastAdventencia, TipoMesaje) + + + Dim MsgSalida As String = "" + If sbNoencontrados.ToString.Length > 0 Then + MsgSalida = $"UUIDS no encotradas o sin saldo: {sbNoencontrados.ToString()}
" + End If + + MsgSalida = $"{MsgSalida}Se seleccionó {(SaldoNota - SaldoNotaPorAplicar).ToString("###,###,###.00")} de {SaldoNota.ToString("###,###,###.00")} a {CountAplicacion} factura{If(CountAplicacion > 0, "s", "")}." + + Alert(MsgSalida, TipoMesaje) + + If CountAplicacion > 0 Then + BtnFacturaNC_Click(Nothing, Nothing) + End If + + End If + + + + End Sub + + End Class + Public Class MMensajeDevolucion Public Property CveMovimiento As Integer Public Property TieneError As Boolean diff --git a/Contabilidad2/RepAnexoCatalogoCC.aspx b/Contabilidad2/RepAnexoCatalogoCC.aspx index d9df7060d..2aab78ff9 100644 --- a/Contabilidad2/RepAnexoCatalogoCC.aspx +++ b/Contabilidad2/RepAnexoCatalogoCC.aspx @@ -17,7 +17,7 @@ - Anexo de Catálogo - Centro Costo + Anexo de Catálogo - Centro Costo @@ -52,7 +52,7 @@