diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 5b3184493..78964e5b4 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -3548,12 +3548,21 @@ Public Class ClsPaginas End Property Property GlobalDTAC_PD_Programas(CveEjeRector As Integer) As DataTable Get + Dim CveEmpresa As Integer = 48 + Dim AppNombre As String = $"GlobalDTAC_PD_Programas-{CveEmpresa}" + 'sino existe, recarga los datos + If HttpContext.Current.Application(AppNombre) Is Nothing Then + Using ObjAC As New ClsAC + If ObjAC.GetClasificacionAdministrativa(CveEmpresa) Then HttpContext.Current.Application(AppNombre) = ObjAC.DtResultados + End Using + End If + GlobalDTAC_PD_Programas = DirectCast(HttpContext.Current.Application(AppNombre), DataTable) If CveEjeRector <> -1 Then - Dim Dv As New DataView(DirectCast(Application("GlobalDTAC_PD_Programas"), DataTable), String.Format("CveEjeRector = {0}", CveEjeRector), "", DataViewRowState.CurrentRows) + Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), String.Format("CveEjeRector = {0}", CveEjeRector), "", DataViewRowState.CurrentRows) GlobalDTAC_PD_Programas = Dv.ToTable Dv.Dispose() Else - GlobalDTAC_PD_Programas = DirectCast(Application("GlobalDTAC_PD_Programas"), DataTable) + GlobalDTAC_PD_Programas = DirectCast(Application(AppNombre), DataTable) End If End Get Set(value As DataTable) @@ -5454,7 +5463,7 @@ Public Class ClsPaginas If XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Name = "tfd:TimbreFiscalDigital" Then Vta.FolioFiscal = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("UUID").InnerText Vta.NoSerieCertificado = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("NoCertificadoSAT").InnerText - Vta.FechaCertificacion = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("FechaTimbrado").InnerText.ToDate + Vta.FechaTimbrado = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("FechaTimbrado").InnerText.ToDate Vta.SelloCFDi = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("SelloCFD").InnerText Vta.SelloSAT = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("SelloSAT").InnerText End If @@ -5573,7 +5582,7 @@ Public Class ClsPaginas If XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Name = "tfd:TimbreFiscalDigital" Then Vta.FolioFiscal = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("UUID").InnerText Vta.NoSerieCertificado = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("noCertificadoSAT").InnerText - Vta.FechaCertificacion = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("FechaTimbrado").InnerText.ToDate + Vta.FechaTimbrado = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("FechaTimbrado").InnerText.ToDate Vta.SelloCFDi = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("selloCFD").InnerText Vta.SelloSAT = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("selloSAT").InnerText End If @@ -5651,7 +5660,7 @@ Public Class ClsPaginas 'ImgCBB = String.Format("{0}://{1}:{2}/Empresas/{3}/CBB/{4}.jpg", Request.Url.Scheme.Replace("https", "http"), Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa, Vta.SerieFolio) 'Dim CadenaOriginals As String = "||1.0|" + Vta.FolioFiscal + "|" + Vta.FechaCertificacion.ToString("yyyy-MM-dd") + "T" + Vta.FechaCertificacion.ToString("HH:mm:ss") + "|" + Vta.SelloCFDi + "|" + Vta.NoSerieCertificado + "||" - Dim CadenaOriginals As String = String.Format("||{0}|{1}|{2}T{3}|{4}|{5}||", If(Vta.Version.Contiene("3.3", "4.0"), "1.1", "1.0"), Vta.FolioFiscal, Vta.FechaCertificacion.ToString("yyyy-MM-dd"), Vta.FechaCertificacion.ToString("HH:mm:ss"), Vta.SelloCFDi, Vta.NoSerieCertificado) + Dim CadenaOriginals As String = String.Format("||{0}|{1}|{2}T{3}|{4}|{5}||", If(Vta.Version.Contiene("3.3", "4.0"), "1.1", "1.0"), Vta.FolioFiscal, Vta.FechaTimbrado.ToString("yyyy-MM-dd"), Vta.FechaTimbrado.ToString("HH:mm:ss"), Vta.SelloCFDi, Vta.NoSerieCertificado) If Not ImagenCBB.Exists Then ImgCBB = "" Dim RutaFormato As String = "" Dim RutaFormatoDefault As String = "" @@ -5717,7 +5726,7 @@ Public Class ClsPaginas params.Add(New ReportParameter("DomicilioSucursal", DomicilioSucursal)) params.Add(New ReportParameter("Vencimiento", Vta.FechaVencimiento.ToString("dd/MM/yyyy"))) params.Add(New ReportParameter("FolioFiscal", Vta.FolioFiscal)) - params.Add(New ReportParameter("FechaCertificacion", String.Format("{0}T{1}", Vta.FechaCertificacion.ToString("yyyy-MM-dd"), Vta.FechaCertificacion.ToString("HH:mm:ss")))) + params.Add(New ReportParameter("FechaCertificacion", String.Format("{0}T{1}", Vta.FechaTimbrado.ToString("yyyy-MM-dd"), Vta.FechaTimbrado.ToString("HH:mm:ss")))) params.Add(New ReportParameter("SelloCFDI", Vta.SelloCFDi)) params.Add(New ReportParameter("CadenaSAT", CadenaOriginals)) params.Add(New ReportParameter("SelloSAT", Vta.SelloSAT)) diff --git a/App_Code/ClsTransportes.vb b/App_Code/ClsTransportes.vb index 557fce9f3..13189b553 100644 --- a/App_Code/ClsTransportes.vb +++ b/App_Code/ClsTransportes.vb @@ -339,8 +339,6 @@ Public Class ClsTransportes End Function #End Region -#End Region - #Region "Rutas" Public Function GetRutas(CveRuta As Integer, CveUsuario As Integer, CveEmpresa As Integer, Ruta As String, Estatus As Boolean, FechaIng As DateTime) As Boolean Dim Retorno As Boolean = False diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 2106523ac..5839b9a96 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -424,7 +424,7 @@ Public Class ClsVentas Return Retorno End Function - Public Function AddVenta(TipoDocto As String, FolioFact As Integer, CveCliente As Integer, CveClienteSucursal As Integer, SubTotal As Double, Descuento As Double, Amortizacion As Double, IVA As Double, RetIVA As Double, RetISR As Double, Total As Double, + Public Function AddVenta(TipoDocto As String, FolioFact As Integer, CveCliente As Integer, CveClienteSucursal As Integer, SubTotal As Decimal, Descuento As Decimal, Amortizacion As Decimal, IVA As Decimal, RetIVA As Decimal, RetISR As Decimal, Total As Decimal, CveMoneda As Integer, TipoCambio As Double, CveMetodoPago As Integer, CondicionesPago As Integer, FormaPago As Integer, FechaVencimiento As DateTime, Fecha As DateTime, MotivoDescuento As String, Observaciones As String, FechaEjecucion As DateTime, CveVendedor As Integer, Alfa1 As String, Alfa2 As String, Alfa3 As String, Num1 As Double, Num2 As Double, Num3 As Double, Fech1 As Date, Fech2 As Date, Fech3 As Date, CveCorte As Integer, NumeroPersonas As Integer, CvePrePoliza As Integer, CveUsuario As Integer, CveEmpresa As Integer, @@ -438,7 +438,8 @@ Public Class ClsVentas Optional DiasCredito As Integer = 0, Optional EsDiasCreditoFijo As Boolean = False, Optional AnticipoEspecial As Boolean = False, Optional Kilometraje As Double = 0, Optional EsAmortizacion As Boolean = False, Optional CveTipoRetencion As Integer = 0, Optional CorreoNotificacion As String = "", Optional FormaPaqueteria As Integer = 1, Optional FacturarSucursal As Boolean = False, Optional VentaDesglosaIEPS As Boolean = False, Optional ServicioDomicilio As Boolean = False, Optional RFCReceptor As String = "", Optional Adjunto As String = "-1", Optional DevolucionImportePagado As Decimal = 0, Optional EsGarantia As Boolean = False, Optional CveLineaAdicional As Integer = -1, Optional DescripcionVenta As String = "", - Optional CveMedico As Integer = -1, Optional CveProcedimiento As Integer = -1, Optional CveTipoVenta As Integer = -1, Optional RequiereOS As Boolean = False + Optional CveMedico As Integer = -1, Optional CveProcedimiento As Integer = -1, Optional CveTipoVenta As Integer = -1, Optional RequiereOS As Boolean = False, + Optional FechaParaSurtir As DateTime = MinFecha ) As Boolean Dim Retorno As Boolean = False @@ -449,15 +450,15 @@ Public Class ClsVentas .Add("@FolioFact", SqlDbType.Int).Value = FolioFact .Add("@CveCliente", SqlDbType.Int).Value = CveCliente .Add("@CveClienteSucursal", SqlDbType.Int).Value = CveClienteSucursal - .Add("@SubTotal", SqlDbType.Float).Value = SubTotal.RoundSQL - .Add("@Descuento", SqlDbType.Float).Value = Descuento.RoundSQL - .Add("@Amortizacion", SqlDbType.Float).Value = Amortizacion.RoundSQL - .Add("@IVA", SqlDbType.Float).Value = IVA.RoundSQL - .Add("@IEPS", SqlDbType.Float).Value = IEPS.RoundSQL - .Add("@RetIVA", SqlDbType.Float).Value = RetIVA.RoundSQL - .Add("@RetISR", SqlDbType.Float).Value = RetISR.RoundSQL - .Add("@ImpuestoLocal", SqlDbType.Float).Value = ImpuestoLocal.RoundSQL - .Add("@Total", SqlDbType.Float).Value = Total.RoundSQL + .Add("@SubTotal", SqlDbType.Money).Value = SubTotal.RoundSQL + .Add("@Descuento", SqlDbType.Money).Value = Descuento.RoundSQL + .Add("@Amortizacion", SqlDbType.Money).Value = Amortizacion.RoundSQL + .Add("@IVA", SqlDbType.Money).Value = IVA.RoundSQL + .Add("@IEPS", SqlDbType.Money).Value = IEPS.RoundSQL + .Add("@RetIVA", SqlDbType.Money).Value = RetIVA.RoundSQL + .Add("@RetISR", SqlDbType.Money).Value = RetISR.RoundSQL + .Add("@ImpuestoLocal", SqlDbType.Money).Value = ImpuestoLocal.RoundSQL + .Add("@Total", SqlDbType.Money).Value = Total.RoundSQL .Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda .Add("@TipoCambio", SqlDbType.Float).Value = TipoCambio .Add("@CveMetodoPago", SqlDbType.Int).Value = CveMetodoPago @@ -480,7 +481,7 @@ Public Class ClsVentas .Add("@Fech3", SqlDbType.VarChar).Value = IIf(Fech3.ToString.Contiene("1/1/0001 12:00:00 a. m.", "01/01/0001 12:00:00 a. m."), "-1", Fech3.ToString("yyyy/MM/dd")) .Add("@CveCorte", SqlDbType.Int).Value = CveCorte .Add("@NumeroPersonas", SqlDbType.Int).Value = NumeroPersonas - .Add("@Propina", SqlDbType.Float).Value = Propina + .Add("@Propina", SqlDbType.Money).Value = Propina .Add("@CveVentaTerminal", SqlDbType.Int).Value = CveVentaTerminal .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza .Add("@AtencionA", SqlDbType.VarChar).Value = AtencionA @@ -544,6 +545,7 @@ Public Class ClsVentas .Add("@CveProcedimiento", SqlDbType.Int).Value = CveProcedimiento .Add("@CveTipoVenta", SqlDbType.Int).Value = CveTipoVenta .Add("@RequiereOS", SqlDbType.Int).Value = RequiereOS + .Add("@FechaParaSurtir", SqlDbType.DateTime).Value = If(FechaParaSurtir = MinFecha, Fecha, FechaParaSurtir) .Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue @@ -1380,7 +1382,8 @@ Public Class ClsVentas CvePresupuestoIngreso As Integer, Optional TiempoEntrega As String = "", Optional CveVentaDetallePadre As Integer = -1, Optional CveContratoDetalle As Integer = -1, Optional PorcentajeIVA As Decimal = 0, Optional IEPS As Decimal = -1, Optional PorcentajeIEPS As Double = 0, Optional CvePromocionDetalle As Integer = -1, Optional CveMovimientoDetallePedido As Integer = -1, Optional ImporteRetIVA As Decimal = 0, Optional PorcentajeRetIVA As Double = 0, - Optional ImporteRetISR As Decimal = 0, Optional PorcentajeRetISR As Decimal = 0, Optional CuentaPredial As String = "", Optional CvePrecioLista As Integer = -1, Optional CveActivoFijo As Integer = -1, Optional NumTurnos As Decimal = 0D) As Boolean + Optional ImporteRetISR As Decimal = 0, Optional PorcentajeRetISR As Decimal = 0, Optional CuentaPredial As String = "", Optional CvePrecioLista As Integer = -1, Optional CveActivoFijo As Integer = -1, + Optional NumTurnos As Decimal = 0D, Optional EstatusAlmacen As Integer = 0) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_VentasDetalleAdd") @@ -1413,6 +1416,7 @@ Public Class ClsVentas .Add("@CvePrecioLista", SqlDbType.Int).Value = CvePrecioLista .Add("@CveActivoFijo", SqlDbType.Int).Value = CveActivoFijo .Add("@NumTurnos", SqlDbType.Decimal).Value = NumTurnos + .Add("@EstatusAlmacen", SqlDbType.Int).Value = EstatusAlmacen End With Try diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb index 4fd52665f..2feb5e7e7 100644 --- a/App_Code/Modelos.vb +++ b/App_Code/Modelos.vb @@ -7094,7 +7094,6 @@ Namespace Modelos Public Property FacturarSucursal As Boolean = False 'Public Property Sucursal As SucursalModel Public Property SubProyecto As Modelos.SubProyectoModel - Public Property DtDetalle As Data.DataTable Public Property DtMercancias As Data.DataTable Public Property DtDetalleAC As Data.DataTable @@ -7108,7 +7107,6 @@ Namespace Modelos Public Property DtDesgloseImpuestos As Data.DataTable Public Property DtDocumentosRelacionados As Data.DataTable Public Property DtNCVinculadas As Data.DataTable - Public Property DtAnticipos As Data.DataTable Public Property DtPromociones As Data.DataTable Public Property DtImpuestosLocales As Data.DataTable @@ -7122,10 +7120,8 @@ Namespace Modelos Public Property DtDocumentacionCliente As Data.DataTable Public Property DtContratosSerieDetalle As Data.DataTable Public Property DtOtrosConceptos As Data.DataTable - Public Property DtRemisionesDocumentosRelacionados As Data.DataTable Public Property DtInventario As Data.DataTable - 'Public Property DtAnticipoAmortizacion As Data.DataTable Public Property DtRemConceptosSurtidos As Data.DataTable Public Property UsadosBonificacion As List(Of Integer) Public Property TipoBonificacion As Integer = 0 @@ -7176,7 +7172,6 @@ Namespace Modelos Public Property RefDocto As String = "" Public Property RealizarDevolucionAlmacen As Boolean Public Property CveAlmacenDevolucionVenta As Integer - Public Property TipoDocumento As String @@ -7224,28 +7219,6 @@ Namespace Modelos End Select End Get End Property - Public ReadOnly Property TipodeComprobanteSAT As ClbNegBICFDv3_2.TipoDeComprobante - Get - Select Case TipoDocto - Case "Ing" - Return ClbNegBICFDv3_2.TipoDeComprobante.ingreso - Case "Egs" - Return ClbNegBICFDv3_2.TipoDeComprobante.egreso - Case "Dev" - Return ClbNegBICFDv3_2.TipoDeComprobante.egreso - Case "Cot" - Return Nothing - Case "Rem" - Return Nothing - Case "Nom" - Return Nothing - Case "Ant" - Return ClbNegBICFDv3_2.TipoDeComprobante.ingreso - Case Else - Return Nothing - End Select - End Get - End Property Public ReadOnly Property ClaseDoctoSat As Integer Get Select Case TipoDocto @@ -7293,7 +7266,6 @@ Namespace Modelos Return retorno End Get End Property - Public Property CondicionesPago As Integer = 0 ' 0 - Contado, 1 - Credito (CHECAR) Public ReadOnly Property CondicionesPagoText As String @@ -7308,7 +7280,6 @@ Namespace Modelos Return retorno End Get End Property - Public Property MotivoDescuento As String = "" Public Property EsGarantia As Boolean = False @@ -7433,24 +7404,21 @@ Namespace Modelos Public Property Num1 As Double = 0 Public Property Num2 As Double = 0 Public Property Num3 As Double = 0 - Public Property DiasCredito As Integer Public Property EsDiasCreditoFijo As Boolean - Public Property CveCorte As Integer = -1 'Public Property CveMesa As Integer = -1 Public Property NumeroPersonas As Integer = 0 Public Property FechaPago As Date - Public Property CveNCaVincular As Integer Public Property FolioFiscal As String = "" Public Property NoSerieCertificado As String Public Property SelloCFDi As String = "" Public Property SelloSAT As String = "" Public Property FechaEmision As Date - Public Property FechaCertificacion As Date + Public Property FechaTimbrado As Date Public Property NoSerieCertificadoContribuyente As String Public Property NumeroCuenta As String = "" Public Property CveTipoAmortizacionAnticipo As Integer = -1 @@ -7564,8 +7532,8 @@ Namespace Modelos Public Property VendedorCodigo As String = "" Public Property CveSucursalEjecucion As Integer Public Property FechaEjecucion As DateTime + Public Property FechaParaSurtir As DateTime = MinFecha Public Property CveSucursalCobranza As Integer - Public Property CveSubProyectoCobranza As Integer Public Property CveSubProyectoEjecucion As Integer Public Property CveOS As Integer @@ -7578,25 +7546,16 @@ Namespace Modelos Public Property TipoEstatus As Integer = 0 Public Property CveCondicionEntrega As Integer = -1 Public Property CondicionEntrega As String = "" - Public Property TipoRelacion As String Public Property UUIDRelacionados As List(Of String) - - Public Property CveVentaRelacion As Integer = -1 Public Property ImporteRelacion As Decimal - Public Property EsNCAmortizacion As Boolean Public Property Kilometraje As Decimal - Public Property CveTipoRetencion As Integer - Public Property VentaDesglosaIEPS As Boolean - Public Property CveMotivoCancelacion As Integer = -1 - Public Property MotivoCancelacion As String = "" - Public Property TipoContable As Integer = -1 #End Region diff --git a/General/CatRimTamanios.aspx.vb b/General/CatRimTamanios.aspx.vb index 79a1c0e96..b5bc39021 100644 --- a/General/CatRimTamanios.aspx.vb +++ b/General/CatRimTamanios.aspx.vb @@ -30,7 +30,7 @@ Partial Class General_CatRimTamanios End Sub Private Sub CargaDatos() Dim ObjGral As New ClsGenerales - If ObjGral.GetRimTamanios(UsuarioActual.CveEmpresa) Then + If ObjGral.GetRinTamanios(UsuarioActual.CveEmpresa) Then GvDatos.DataSource = ObjGral.DtResultados End If ObjGral.Dispose() diff --git a/General/SaldosIniciales.aspx.vb b/General/SaldosIniciales.aspx.vb index 95f405963..428c5e9b5 100644 --- a/General/SaldosIniciales.aspx.vb +++ b/General/SaldosIniciales.aspx.vb @@ -4,8 +4,7 @@ Imports System.Data Imports System.Math Imports ClosedXML.Excel Imports Extensiones -Imports GemBox.Spreadsheet -Imports log4net.Filter + Partial Class General_SaldosIniciales Inherits ClsPaginas @@ -1601,14 +1600,14 @@ Partial Class General_SaldosIniciales Dim Fecha As Date = Row("Fecha").ToString().ToDate Dim FechaVencimiento As Date = Row("Fecha Vencimiento").ToString().ToDate Dim ImpuestoLocal As Decimal = If(dt.Columns.Contains("ImpuestoLocal"), Row("ImpuestoLocal").ToString().ToDecimal, 0D) - Dim Amortizacion As Double = If(dt.Columns.Contains("Amort.Ant"), Row("Amort.Ant").ToString().ToDouble, 0.0) + Dim Amortizacion As Decimal = If(dt.Columns.Contains("Amort.Ant"), Row("Amort.Ant").ToString().ToDecimal, 0) Dim SubTotal As Decimal = Row("SubTotal").ToString().ToDecimal Dim IVA As Decimal = Row("IVA").ToString().ToDecimal Dim Total As Decimal = Row("Total").ToString().ToDecimal Dim Saldo As Decimal = Row("Saldo").ToString().ToDecimal Dim CveCliente As Integer = DtClientes.FiltroPrimeroValor("CveCliente", $"RFC = '{RFC}'").ToString().ToEntero() Dim RetIVA As Decimal = Row("Ret IVA").ToString().ToDecimal - Dim RetISR As Double = Row("Ret ISR").ToString().ToDouble + Dim RetISR As Decimal = Row("Ret ISR").ToString().ToDecimal Dim Moneda As String = Row("Moneda").ToString() Dim TipoCambio As String = Row("Tipo Cambio").ToString() Dim CveMoneda As Integer = 1 diff --git a/Ventas/PVCobranza.aspx b/Ventas/PVCobranza.aspx index f9d40297c..e4e8fa634 100644 --- a/Ventas/PVCobranza.aspx +++ b/Ventas/PVCobranza.aspx @@ -1,296 +1,822 @@ -<%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="PVCobranza.aspx.vb" Inherits="Ventas_PVCobranza" %> - - - - - - - - - - - Cobranza - - - - - - - -
-
-
- - -
-
-
-
+<%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="PVCobranza.aspx.vb" Inherits="Ventas_PVCobranza" %> + +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> + + + + + + + + + +
  • + Estado de Caja +
    • +
  • + Ingreso de Efectivo +
    • +
  • + Retiro de Efectivo +
    • +     +     +     + + Cobranza + + + + + + + +
    +
    +
    + + +
    +
    +
    +
    Sucursal: -
    -
    - - - -
    -
    - Fecha Inicio Docto: -
    -
    -
    - - - - -
    - - - - - - -
    -
    - Fecha Fin Docto: -
    -
    -
    - - - - -
    - - - - - - -
    -
    -
    -
    - -
    -     -     - - -
    -
    - - - - - - - - - - - - - -
    -
    - -
    -
    - - Nombre: - -           - - - - - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    - $ - - -
    -
    - - - -
    -
    -
    - -
    -
    - -
    - $ - - -
    -
    - - - -
    -
    - - MSI - 3M - 6M - 9M - 12M - - <%-- - --%> -
    -
    -
    - -
    -
    - -
    - $ - - -
    -
    - - - -
    -
    -
    -
    -
    - -
    - $ - - -
    -
    - - - -
    -
    -
    - -
    -
    - -
    - $ - - -
    -
    - - - -
    -
    -
    - -
    -
    - -
    - - Otros - Credito - Debito - Cheque - -
    - -
    - $ - - -
    - -
    - - - -
    - -
    - - Meses - 3M - 6M - 9M - 12M - -
    - -
    -
    - -
    -
    - -
    - $ - - - -
    - -
    - $ - - -
    -
    -
    -
    -
    - - - -
    -
    -
    -
    -
    -
    -
    -     -
    -
    -     -     -     - + +
    +
    + + + +
    +
    + Fecha Inicio Docto: + +
    +
    +
    + + + + +
    + + + + + + +
    +
    + Fecha Fin Docto: + +
    +
    +
    + + + + +
    + + + + + + +
    +
    +
    +
    + +
    +     +     + + +
    + + +
    + Turno: + +
    +     +     +
    +
    +
    + + + + + + + + + + + + + +
    +
    + +
    +
    + Nombre: + +           + + + + + + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    + $ + + +
    +
    + + + +
    +
    +
    + +
    +
    + +
    + $ + + +
    +
    + + + +
    +
    + + MSI + 3M + 6M + 9M + 12M + + <%-- + --%> +
    +
    +
    + +
    +
    + +
    + $ + + +
    +
    + + + +
    +
    +
    +
    +
    + +
    + $ + + +
    +
    + + + +
    +
    +
    + +
    +
    + +
    + $ + + +
    +
    + + + +
    +
    +
    + +
    +
    + +
    + + Otros + Credito + Debito + Cheque + +
    + +
    + $ + + +
    + +
    + + + +
    + +
    + + Meses + 3M + 6M + 9M + 12M + +
    + +
    +
    + +
    +
    + +
    + $ + + + +
    + +
    + $ + + +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +
    +
    +     +
    +
    +     +     + + + + + + + + + + + + + +     + - + function CalculaDiferencia() { + ; + var total = 0 + total = ToDouble($('#C_TxtEfectivoEnCaja').val()) - ToDouble($('#C_LblEfectivoEsperado').text()); + $('#C_LblDiferenciaCaja').text(FormatoNumero(total)); + } + + function CalculaDiferenciaBloqueo() { + var total = 0; + total = ToDouble($('#C_TxtEfectivoCajaBloqueo').val()) - ToDouble($('#C_LblEfectivoBloqueo').text()); + $('#C_LblDiferenciaCajaBloqueo').val(FormatoNumero(total)); + } + + + diff --git a/Ventas/PVCobranza.aspx.vb b/Ventas/PVCobranza.aspx.vb index fa46e1e24..8161e583b 100644 --- a/Ventas/PVCobranza.aspx.vb +++ b/Ventas/PVCobranza.aspx.vb @@ -14,13 +14,24 @@ Partial Class Ventas_PVCobranza Set(value As Integer) ViewState("CveCorte") = value End Set + End Property + + Private Property DineroCaja As Double + Get + Return If(IsNothing(ViewState("DineroCaja")), 0, ViewState("DineroCaja").ToString().ToDecimal()) + End Get + Set(value As Double) + ViewState("DineroCaja") = value + End Set End Property Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load If Not Page.IsPostBack Then CveCorte = 0 CargaFiltros() - CargaCorteCaja() + If UsuarioActual.TienePermisoProceso(371) Then + CargaCorteCaja() + End If End If End Sub @@ -59,31 +70,118 @@ Partial Class Ventas_PVCobranza DdlCuentaTarjetaDebito.DataBind() DdlCuentaCheque.DataBind() DdlCuentaTransferencia.DataBind() + TxtImporteEfectivo.Attributes.Add("onKeyUp", "CalculaTotalPagoContado();") TxtImporteCredito.Attributes.Add("onKeyUp", "CalculaTotalPagoContado();") TxtImporteDebito.Attributes.Add("onKeyUp", "CalculaTotalPagoContado();") TxtImporteCheque.Attributes.Add("onKeyUp", "CalculaTotalPagoContado();") TxtImporteTransferencia.Attributes.Add("onKeyUp", "CalculaTotalPagoContado();") - TxtImporteOtrosContado.Attributes.Add("onKeyUp", "CalculaTotalPagoContado();") + TxtImporteOtrosContado.Attributes.Add("onKeyUp", "CalculaTotalPagoContado();") + + TxtEfectivoEnCaja.Attributes.Add("onKeyUp", "CalculaDiferencia();") + TxtEfectivoCajaBloqueo.Attributes.Add("onKeyUp", "CalculaDiferenciaBloqueo();") End Sub - Private Sub CargaCorteCaja() - Dim DebeCerrarCorte As Boolean = False - 'Checar si hay un Turno Abierto - Dim ObjPVenta As New ClsPuntoVenta - - If ObjPVenta.GetVta_Cortes("-1", "-1", UsuarioActual.CveUsuario, -1, UsuarioActual.CveEmpresa, 0) Then - - If ObjPVenta.DtResultados.Rows.Count > 0 Then - CveCorte = ObjPVenta.CveCorte - End If - End If - ObjPVenta.Dispose() - - + Private Sub CargaCorteCaja() + Dim DebeCerrarCorte As Boolean = False + 'Checar si hay un Turno Abierto + Dim ObjPVenta As New ClsPuntoVenta + + If ObjPVenta.GetVta_Cortes("-1", "-1", UsuarioActual.CveUsuario, -1, UsuarioActual.CveEmpresa, 0) Then + + If ObjPVenta.DtResultados.Rows.Count > 0 Then + CveCorte = ObjPVenta.CveCorte + Dim FechaICorte As Date = ObjPVenta.FechaInicial.Date '.AddDays(-5) + If UsuarioActual.Empresa.Funcionalidad(531) = "1" AndAlso FechaICorte < NowADS().Date Then + DebeCerrarCorte = True + LblMotivoBloqueo.Text = $"Existe un corte del día {FechaICorte.ToString("dd/MM/yyyy")}. Favor de cerrarlo para iniciar un nuevo corte." + Else + LblTurno.Text = ObjPVenta.FechaInicial.ToShortDateString + BtnIniciarTurno.Visible = False + LkbEstadodeCaja.Visible = True + LkbIngreso.Visible = True + LkbRetiro.Visible = True + UpTurno.Visible = True + End If + + Else + UpTurno.Visible = False + 'Ingresar un nuevo Turno + RegistraScript("window.onload = function MuestraCorteCaja() { document.getElementById(""C_btnShow"").click(); }") + End If + End If + ObjPVenta.Dispose() + + If DebeCerrarCorte Then + CargaDatosCorte() + RegistraScript("window.onload = function MuestraPantallaBloqueo() { document.getElementById(""C_btnShowBloqueo"").click(); }") + End If + End Sub + + Private Sub CargaDatosCorte() + Dim ObjPVenta As New ClsPuntoVenta + Dim Total As Double + + If ObjPVenta.GetVta_Cortes("-1", "-1", UsuarioActual.CveUsuario, -1, UsuarioActual.CveEmpresa, 0) Then + If ObjPVenta.DtResultados.Rows.Count > 0 Then + + Total = ObjPVenta.DtResultados(0)("ImporteInicial").ToString().ToDouble + ObjPVenta.DtResultados(0)("VentasEfectivo").ToString().ToDouble + ObjPVenta.DtResultados(0)("Ingresado").ToString().ToDouble - ObjPVenta.DtResultados(0)("Retirado").ToString().ToDouble - ObjPVenta.DtResultados(0)("Devoluciones").ToString().ToDouble + DineroCaja = Total + LblEfectivoEsperado.Text = Total.FormatoNumero(2) + LblEfectivoBloqueo.Text = Total.FormatoNumero(2) + + Dim Dt As New DataTable + + Dt.Columns.Add("Descripcion", GetType(String)) + Dt.Columns.Add("Importe", GetType(Decimal)) + + Dim Dr1 As DataRow = Dt.NewRow + Dr1("Descripcion") = "Fondo de Caja" + Dr1("Importe") = ObjPVenta.DtResultados(0)("ImporteInicial").ToString().ToDouble + Dt.Rows.Add(Dr1) + + Dim Dr2 As DataRow = Dt.NewRow + Dr2("Descripcion") = "Ventas en Efectivo" + Dr2("Importe") = ObjPVenta.DtResultados(0)("VentasEfectivo").ToString().ToDouble + Dt.Rows.Add(Dr2) + + Dim Dr21 As DataRow = Dt.NewRow + Dr21("Descripcion") = "Devoluciones" + Dr21("Importe") = ObjPVenta.DtResultados(0)("Devoluciones").ToString().ToDouble + Dt.Rows.Add(Dr21) + + 'Dim Dr3 = Dt.NewRow + 'Dr3("Descripcion") = "Propinas" + 'Dr3("Importe") = ObjPVenta.DtResultados(0)("Propina").ToString().ToDouble + 'Dt.Rows.Add(Dr3) + + Dim Dr4 As DataRow = Dt.NewRow + Dr4("Descripcion") = "Entradas" + Dr4("Importe") = ObjPVenta.DtResultados(0)("Ingresado").ToString().ToDouble + Dt.Rows.Add(Dr4) + + Dim Dr5 As DataRow = Dt.NewRow + Dr5("Descripcion") = "Salidas" + Dr5("Importe") = ObjPVenta.DtResultados(0)("Retirado").ToString().ToDouble + Dt.Rows.Add(Dr5) + + Dim Dr6 As DataRow = Dt.NewRow + Dr6("Descripcion") = "Total" + Dr6("Importe") = Total + Dt.Rows.Add(Dr6) + + GvDineroCaja.DataSource = Dt + GvDineroCaja.DataBind() + UpDineroCaja.Update() + UpTerminarCorte.Update() + + End If + End If + + ObjPVenta.Dispose() + End Sub - Private Sub CargaDatos() Dim ObjMovtos As New ClsMovimientos() @@ -276,6 +374,128 @@ Partial Class Ventas_PVCobranza End If Return Retorno - End Function - + End Function + + Protected Sub BtnCerrarCaja_Click(sender As Object, e As EventArgs) + RegistraScript("$('#DivEstadoCaja').modal('hide')") + RegistraScript("$('#DivTerminarCorte').modal()", "divterminarcorte") + End Sub + Protected Sub LkbIngreso_Click(sender As Object, e As EventArgs) + CargaIngresoEgreso(1) + End Sub + Public Sub CargaIngresoEgreso(Opcion As Integer) + RegistraScript("$('#DivIngresoEgreso').modal()") + If Opcion = 1 Then + LblTituloIE.Text = "Ingreso de Efectivo: " + HdnTipoMovimiento.Value = "1" + ElseIf Opcion = 0 Then + LblTituloIE.Text = "Retiro de Efectivo: " + HdnTipoMovimiento.Value = "0" + End If + UpIngresoEgreso.Update() + End Sub + Protected Sub LkbRetiro_Click(sender As Object, e As EventArgs) + CargaIngresoEgreso(0) + End Sub + + Private Sub LkbEstadodeCaja_Click(sender As Object, e As EventArgs) Handles LkbEstadodeCaja.Click + CargaDatosCorte() + CargaVentasPago() + CargaEntradasSalidas() + RegistraScript("$('#DivEstadoCaja').modal()") + End Sub + + Private Sub CargaVentasPago() + Dim ObjPVenta As New ClsPuntoVenta + + If ObjPVenta.GetVta_MetodosPago(CveCorte) Then + If ObjPVenta.DtResultados.Rows.Count > 0 Then + GvMetodosPago.DataSource = ObjPVenta.DtResultados + GvMetodosPago.DataBind() + UpMetodosPago.Update() + End If + End If + + ObjPVenta.Dispose() + End Sub + Private Sub CargaEntradasSalidas() + Dim ObjPVenta As New ClsPuntoVenta + + 'Salida + If ObjPVenta.GetVta_MovimientosCajas(CveCorte, 0) Then + If ObjPVenta.DtResultados.Rows.Count > 0 Then + GvEgresos.DataSource = ObjPVenta.DtResultados + GvEgresos.DataBind() + UpEgresos.Update() + End If + End If + + 'Entrada + If ObjPVenta.GetVta_MovimientosCajas(CveCorte, 1) Then + If ObjPVenta.DtResultados.Rows.Count > 0 Then + GvIngresos.DataSource = ObjPVenta.DtResultados + GvIngresos.DataBind() + UpIngresos.Update() + End If + End If + + ObjPVenta.Dispose() + End Sub + Private Sub BtnCerrarTurno_Click(sender As Object, e As EventArgs) Handles BtnCerrarTurno.Click + Dim ObjPVenta As New ClsPuntoVenta + If TxtEfectivoEnCaja.Text.Trim <> "" Then + If ObjPVenta.UpdateFinalizadoVtaCortes(CveCorte, TxtEfectivoEnCaja.Text.ToDouble, LblDiferenciaCaja.Text.ToDouble, NowADS(), UsuarioActual.CveEmpresa) Then + RegistraScript($"window.location.href = '/Compras/PopUpVerFactura.aspx?P={Encripta(String.Format("OP=CORT&CVECORTE={0}&FORMATO={1}", CveCorte, "PDF"))}'", "Imprimir") + Dim Liga As String = "document.location.href=""/Ventas/PVCobranza.aspx"";" + Alert("Se ha cerrado el turno correctamente.", TipoMensaje.MsgInformacion, Liga) + End If + End If + ObjPVenta.Dispose() + End Sub + Private Sub BtnCerrarBloqueo_Click(sender As Object, e As EventArgs) Handles BtnCerrarBloqueo.Click + Dim ObjPVenta As New ClsPuntoVenta + If TxtEfectivoCajaBloqueo.Text.Trim <> "" Then + If ObjPVenta.UpdateFinalizadoVtaCortes(CveCorte, TxtEfectivoCajaBloqueo.Text.ToDouble, LblDiferenciaCajaBloqueo.Text.ToDouble, NowADS(), UsuarioActual.CveEmpresa) Then + RegistraScript($"window.location.href = '/Compras/PopUpVerFactura.aspx?P={Encripta(String.Format("OP=CORT&CVECORTE={0}&FORMATO={1}", CveCorte, "PDF"))}'", "Imprimir") + Dim Liga As String = "document.location.href=""/Ventas/PVCobranza.aspx"";" + Alert("Se ha cerrado el turno correctamente.", TipoMensaje.MsgInformacion, Liga) + End If + Else + Alert("Debe especificar el efectivo en caja", TipoMensaje.MsgAdvertencia) + RegistraScript("window.onload = function MuestraPantallaBloqueo() { document.getElementById(""C_btnShowBloqueo"").click(); }") + End If + ObjPVenta.Dispose() + End Sub + Private Sub BtnIniciarTurno_Click(sender As Object, e As EventArgs) Handles BtnIniciarTurno.Click + Dim ObjPVenta As New ClsPuntoVenta + + ObjPVenta.AddVtaCortes(NowADS(), TxtDineroCaja.Text.ToDecimal, UsuarioActual.CveUsuario, TxtDescripcionCaja.Text, UsuarioActual.CveEmpresa) + CveCorte = ObjPVenta.CveCorte + LblTurno.Text = NowADS().ToShortDateString + UpTurno.Visible = True + LkbEstadodeCaja.Visible = True + LkbIngreso.Visible = True + LkbRetiro.Visible = True + BtnIniciarTurno.Visible = False + + ObjPVenta.Dispose() + + RegistraScript("$('#DivCorteDeCaja').hide();") + + UpTurno.Update() + End Sub + + Private Sub BtnAceptarIE_Click(sender As Object, e As EventArgs) Handles BtnAceptarIE.Click + Dim ObjPVenta As New ClsPuntoVenta + If TxtCantidadIE.Text.ToEntero() > 0 Then + If ObjPVenta.AddVta_MovimientosCajas(CveCorte, UsuarioActual.CveUsuario, TxtCantidadIE.Text.ToDouble, TxtDescripcionIE.Text, HdnTipoMovimiento.Value.ToEntero(), NowADS()) Then + TxtCantidadIE.Text = "" + TxtDescripcionIE.Text = "" + RegistraScript("$('#DivIngresoEgreso').modal('hide')", "divingresoegreso") + Alert("El movimiento se realizó correctamente") + UpIngresoEgreso.Update() + End If + End If + ObjPVenta.Dispose() + End Sub End Class diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx index 81e288727..18d7194e5 100644 --- a/Ventas/Ventas.aspx +++ b/Ventas/Ventas.aspx @@ -582,16 +582,16 @@ - + Requiere Técnico: - + - + Fecha de Cirugia: - + @@ -1976,12 +1976,13 @@
    + +
    - - +   @@ -4093,7 +4094,7 @@ - + <%-- Médico:  @@ -4114,7 +4115,7 @@ Seleccione uno - + --%> @@ -8405,13 +8406,13 @@ <%--Tipo Venta--%>
    -
    +
    -
    +
    -
    +
    @@ -8489,7 +8490,7 @@
    - Requiere Técnico: + Requiere Técnico:
    @@ -8545,6 +8546,40 @@