From 0a0d3f2e4dfe39841b562d27f9e3c1d0ffbbeeaf Mon Sep 17 00:00:00 2001 From: rrene Date: Wed, 21 Feb 2024 20:43:37 -0700 Subject: [PATCH 01/16] timbrado pac4 carta porte --- App_Code/Modelos.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb index a389e480f..4b82eabb7 100644 --- a/App_Code/Modelos.vb +++ b/App_Code/Modelos.vb @@ -1024,9 +1024,11 @@ Namespace Modelos Dim ObjTimbrado As New Timbrado 'DOCUMENTO ACTUAL If DebeTimbrar Then + Dim CvePAC As Integer = -1 If Me.EmitirCartaPorte AndAlso CveTimbreCartaPorte > 0 Then Dim RespCartaPorte As Timbres.MMensajeCartaPorte = Timbres.PreParaCartaPorteFactura(CveTimbreCartaPorte, UsuarioActual) If Not RespCartaPorte.TieneError Then + CvePAC = 4 'código temporal. para que se timbre PAC 4 Me.Timbre.Complementos.CartaPorte = RespCartaPorte.CartaPorte Else DebeTimbrar = False @@ -1034,7 +1036,7 @@ Namespace Modelos End If End If - SeTimbro = ObjTimbrado.TimbrarFactura(UsuarioActual, Me) + SeTimbro = ObjTimbrado.TimbrarFactura(UsuarioActual, Me, CvePACEspecial:=CvePAC) 'NOTA DE CREDITO - REFACTURADA - CASO ESPECIAL, TIMBRADO E IMPRESION If Not IsNothing(Obj2) AndAlso Obj2.Count > 0 Then From ff78573bc2e7aee44980d8da03e7adcbb59197d6 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 22 Feb 2024 05:35:20 -0700 Subject: [PATCH 02/16] - --- Ventas/RepVentas.aspx.vb | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/Ventas/RepVentas.aspx.vb b/Ventas/RepVentas.aspx.vb index ecd30bce7..a36e18d48 100644 --- a/Ventas/RepVentas.aspx.vb +++ b/Ventas/RepVentas.aspx.vb @@ -2,11 +2,8 @@ Option Strict On Imports System.Data -Imports System.Web.Compilation Imports Extensiones Imports Microsoft.Reporting.WebForms -Imports System.Xml.Serialization -Imports System.IO Imports System.Xml Partial Class Ventas_RepVentas @@ -116,20 +113,6 @@ Partial Class Ventas_RepVentas If UsuarioActual.CveEmpresa = 72 AndAlso UsuarioActual.CveUsuario.Contiene(100, 1614, 1517) Then liRepHP.Visible = True End If - - 'SI ES EL USUARIO SISTEMA MOSTRAR LA MODALIDAD CONTABLE (TEMPORAL) - 'If UsuarioActual.CveUsuario = 100 Then - 'divModalidadcontable.Visible = True - 'End If - - 'Modalidad Cotizacion - If Opcion = "Cot" Then - DdlTipoComprobante.SelectedValuesIfExistM(Opcion) - DdlGrupo.SelectedValueExist("7") - DdlTipoComprobante_SelectedIndexChanged(DdlTipoComprobante, EventArgs.Empty) - 'DdlEstatus.SelectedValue = "-1" - End If - CargaGrupo() If UsuarioActual.CveVendedor > 0 AndAlso Not UsuarioActual.TienePermisoProceso(263) Then @@ -147,8 +130,14 @@ Partial Class Ventas_RepVentas DVServicioDomicilio.Visible = True DivLblDistr.Visible = True DivDistr.Visible = True + 'Modalidad Cotizacion + If Opcion = "Cot" Then + DdlTipoComprobante.SelectedValuesIfExistM(Opcion) + DdlGrupo.SelectedValueExist("7") + DdlTipoComprobante_SelectedIndexChanged(DdlTipoComprobante, EventArgs.Empty) + DdlEstatus.ClearSelection() + End If End If - PrePersonalizacion() CargaPersonalizacion() @@ -297,11 +286,8 @@ Partial Class Ventas_RepVentas Agrupador = DdlGrupo.SelectedItem.Text CveProyecto = DdlProyecto.SelectedValue.ToEntero ObjVentas.Dispose() - - GvDatosDataBind() - Primeracontsulta = False End Sub @@ -998,22 +984,16 @@ Partial Class Ventas_RepVentas Protected Sub LnkDescargaCartaPorte_Click(sender As Object, e As EventArgs) - Dim ObjVentas As New ClsVentas Dim DTDataos As New DataTable Dim CveSubProyectos As String = If(DdlSubProyecto.GetSelectedValuesM = "", "-1", DdlSubProyecto.GetSelectedValuesM) - If ObjVentas.GetListadoCartaPorteRep(txtFechaI.Text.ToDate, txtFechaF.Text.ToDate, CveSubProyectos, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then DTDataos = ObjVentas.DtResultados End If ObjVentas.Dispose() - - DTDataos.ExportToExcel("RepCartasPorte") - - End Sub Protected Sub ImgExcelPersonalizado_Click(sender As Object, e As EventArgs) Handles ImgExcelPersonalizado.Click From 69921fc3de9ed227d060809f7ba40d615eab7719 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 22 Feb 2024 05:38:32 -0700 Subject: [PATCH 03/16] - --- Styles/AjaxControlToolkit/Styles/Tabs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Styles/AjaxControlToolkit/Styles/Tabs.css b/Styles/AjaxControlToolkit/Styles/Tabs.css index 8151906c9..5908a0886 100644 --- a/Styles/AjaxControlToolkit/Styles/Tabs.css +++ b/Styles/AjaxControlToolkit/Styles/Tabs.css @@ -86,7 +86,7 @@ border: 1px solid #999999; border-top: 0; font-family: verdana,tahoma,helvetica; - font-size: 10pt; + font-size: 12px; padding: 8px; } From 1bb007262b4bbd06dcd60bee9e1002285c2b10a0 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Thu, 22 Feb 2024 10:06:29 -0700 Subject: [PATCH 04/16] --FIX. error de factura global al refacturar --- Ventas/Ventas.aspx.vb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index c6e1ba575..695d4fe5a 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -12925,16 +12925,18 @@ Partial Class Ventas Timbre.Complementos.ComercioExterior.AplicaComercioExteriorSubProyecto = False End If - If ObjFactura.CveVenta > 0 AndAlso ObjFactura.EsFacturaGlobal Then - Dim SATMes As String = ClsPaginas.GlobalDTGralSATMeses().FiltroPrimeroValor("Mes", $"CveSATMes = {ObjFactura.CveSATMes}") - Dim SATPerioricidad = ClsPaginas.GlobalDTGralSATPeriodicidad().FiltroPrimeroValor("Periodicidad", $"CveSATPeriodicidad = {ObjFactura.CveSATPeriodicidad}") + If ObjFactura IsNot Nothing Then + If ObjFactura.CveVenta > 0 AndAlso ObjFactura.EsFacturaGlobal Then + Dim SATMes As String = ClsPaginas.GlobalDTGralSATMeses().FiltroPrimeroValor("Mes", $"CveSATMes = {ObjFactura.CveSATMes}") + Dim SATPerioricidad = ClsPaginas.GlobalDTGralSATPeriodicidad().FiltroPrimeroValor("Periodicidad", $"CveSATPeriodicidad = {ObjFactura.CveSATPeriodicidad}") - Timbre.InformacionGlobal = New CFDIInformacionGlobal() With { - .Año = ObjFactura.SATAnio.ToString(), - .Meses = SATMes, - .Perioricidad = SATPerioricidad - } + Timbre.InformacionGlobal = New CFDIInformacionGlobal() With { + .Año = ObjFactura.SATAnio.ToString(), + .Meses = SATMes, + .Perioricidad = SATPerioricidad + } + End If End If Return Timbre From 7d335217681712d1472cac774d4e67461ca11f2c Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Thu, 22 Feb 2024 10:09:26 -0700 Subject: [PATCH 05/16] -- fix. prepara timbre --- Ventas/Ventas.aspx.vb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index 695d4fe5a..e6cdac9b0 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -12925,13 +12925,13 @@ Partial Class Ventas Timbre.Complementos.ComercioExterior.AplicaComercioExteriorSubProyecto = False End If - If ObjFactura IsNot Nothing Then - If ObjFactura.CveVenta > 0 AndAlso ObjFactura.EsFacturaGlobal Then - Dim SATMes As String = ClsPaginas.GlobalDTGralSATMeses().FiltroPrimeroValor("Mes", $"CveSATMes = {ObjFactura.CveSATMes}") - Dim SATPerioricidad = ClsPaginas.GlobalDTGralSATPeriodicidad().FiltroPrimeroValor("Periodicidad", $"CveSATPeriodicidad = {ObjFactura.CveSATPeriodicidad}") + If Obj IsNot Nothing Then + If Obj.CveVenta > 0 AndAlso Obj.EsFacturaGlobal Then + Dim SATMes As String = ClsPaginas.GlobalDTGralSATMeses().FiltroPrimeroValor("Mes", $"CveSATMes = {Obj.CveSATMes}") + Dim SATPerioricidad = ClsPaginas.GlobalDTGralSATPeriodicidad().FiltroPrimeroValor("Periodicidad", $"CveSATPeriodicidad = {Obj.CveSATPeriodicidad}") Timbre.InformacionGlobal = New CFDIInformacionGlobal() With { - .Año = ObjFactura.SATAnio.ToString(), + .Año = Obj.SATAnio.ToString(), .Meses = SATMes, .Perioricidad = SATPerioricidad } From fc2f0e4da8c7f5edb3e316ffa098a811148bb42c Mon Sep 17 00:00:00 2001 From: rakcsle Date: Thu, 22 Feb 2024 11:26:33 -0700 Subject: [PATCH 06/16] =?UTF-8?q?SMS=20-=202024.02.22=20Rem=20Campo=20Foli?= =?UTF-8?q?o=20Remisi=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/ClsPaginas.vb | 1 + Empresas/186/Formatos/Remision.mrt | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index e2691714f..cc4a19bb2 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -7078,6 +7078,7 @@ Public Class ClsPaginas params.Add(New ReportParameter("FechaCirugia", Vta.FechaEjecucion.ToString("dd/MM/yyyy HH:mm"))) params.Add(New ReportParameter("Paciente", Vta.Paciente)) params.Add(New ReportParameter("Episodio", Vta.Episodio)) + params.Add(New ReportParameter("Alfa1", Vta.Alfa1)) End If RutaFormato = String.Format("{0}Formatos\{1}.rdlc", UsuarioActual.Empresa.Ruta, NombreArchivo) diff --git a/Empresas/186/Formatos/Remision.mrt b/Empresas/186/Formatos/Remision.mrt index 632d2fdd1..61c05a0f0 100644 --- a/Empresas/186/Formatos/Remision.mrt +++ b/Empresas/186/Formatos/Remision.mrt @@ -54,7 +54,7 @@ - + ReportParameters,ClienteCodigo,ClienteCodigo,ReportParameter1,System.String,_x0030_2,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0035_4a879e0a10d464ba2f01e0372efb9ca ReportParameters,ClienteTelefono,ClienteTelefono,ReportParameter1,System.String,,False,False,True,False,,_x0036_22a3a61b2f247a6ab5d7dc6c66568db ReportParameters,ClienteContacto,ClienteContacto,ReportParameter1,System.String,,False,False,True,False,,_x0035_c52eccfce4d4681a1c62017e690c7c1 @@ -133,9 +133,10 @@ ReportParameters,TipoRelacionTexto,TipoRelacionTexto,ReportParameter1,System.String,,False,False,True,False,,_x0034_17b8382f8e448a5b21018e50590835b ReportParameters,FolioFiscalRelacionado,FolioFiscalRelacionado,ReportParameter1,System.String,,False,False,True,False,,_x0037_0c2d36e39d1464d821ac353ccaa2dcd ReportParameters,ClienteDireccion,ClienteDireccion,ReportParameter1,System.String,,False,False,True,False,,f18e5fd820754666994a9d3f995d50a7 - ReportParameters,Documentacion,Documentacion,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_ - ReportParameters,Paciente,Paciente,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_ - ReportParameters,Episodio,Episodio,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_ + ReportParameters,Documentacion,Documentacion,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C__x002F_StiSerializer_x003E_ + ReportParameters,Paciente,Paciente,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C__x002F_StiSerializer_x003E_ + ReportParameters,Episodio,Episodio,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C__x002F_StiSerializer_x003E_ + ReportParameters,Alfa1,Alfa1,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C__x002F_StiSerializer_x003E_ EngineV2 @@ -1087,7 +1088,8 @@ Vendedor: {VendedorNombre} Paciente: {Paciente} -Episodio: {Episodio} +Episodio: {Episodio} +Folio Remisión: {Alfa1} Black Expression @@ -1138,7 +1140,7 @@ Episodio: {Episodio} Report 10/11/2022 8:18:55 PM 7/11/2022 2:49:19 PM - C:\inetpub\WWWSigGit\Empresas\186\Formatos\Remision.mrt + Remision.mrt 49b2dec77fe542ea952b501bf54fafb1 Report Centimeters From 8aedc0d417572f2b1e34ffb824ebc89707539231 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 22 Feb 2024 13:24:18 -0700 Subject: [PATCH 07/16] -- candado ventaminima. para autorizacions --- Ventas/Ventas.aspx | 4 ++-- Ventas/Ventas.aspx.vb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx index 4adeb74f4..227d61a28 100644 --- a/Ventas/Ventas.aspx +++ b/Ventas/Ventas.aspx @@ -1404,8 +1404,8 @@ <%--19--%> - + diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index c6e1ba575..017e11e01 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -8393,7 +8393,7 @@ Partial Class Ventas DatarowPS = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=TmpDT.Rows(e.RowIndex)("CvePS").ToString().ToEntero()).FiltroPrimero("") ' Estado = -1 'verifica si tiene ventaminima - If Cantidad > 0 AndAlso DatarowPS("VentaMinima").ToString().ToDecimal > 0 AndAlso (DdlTipoComprobante.SelectedValue = "Rem" Or DdlTipoComprobante.SelectedValue = "Ing") Then + If Cantidad > 0 AndAlso DatarowPS("VentaMinima").ToString().ToDecimal > 0 AndAlso (DdlTipoComprobante.SelectedValue.Contiene("Rem", "Ing", "PA")) Then 'verifico que la cantidad sea multiplo de venta minima, es decir ventaminima =5, solo puede vender 5,10,15... If Cantidad Mod DatarowPS("VentaMinima").ToString().ToDecimal <> 0 Then Alert(String.Format("El producto se vende solo en cantidades de {0}", DatarowPS("VentaMinima").ToString())) From 32721f6ef3f9b02bd78414bdcfbea323df11f033 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 22 Feb 2024 13:28:41 -0700 Subject: [PATCH 08/16] - --- Inventarios/EntregaAlmacenRuta.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Inventarios/EntregaAlmacenRuta.aspx.cs b/Inventarios/EntregaAlmacenRuta.aspx.cs index d330d6e05..80f18cafc 100644 --- a/Inventarios/EntregaAlmacenRuta.aspx.cs +++ b/Inventarios/EntregaAlmacenRuta.aspx.cs @@ -209,7 +209,7 @@ public partial class Inventarios_EntregaAlmacenRuta : ClsPaginas { Timbres ObjTimbres = new Timbres("Ent", cvetimbre, UsuarioActual); MensajeAlert.AppendFormat("Folio: {0}  ", ObjTimbres.ObjFactura.SerieFolio); - if (ObjTimbres.Timbrar()) + if (ObjTimbres.Timbrar(4)) { MensajeAlert.AppendFormat("XML    ", ModExtensiones.Encripta(String.Format("OP=DesXmlTra&CveTimbre={0}&EXT={1}&FOLIO={2}&TIPODOCTO={3}", cvetimbre, "XML", ObjTimbres.ObjFactura.SerieFolio, ObjTimbres.ObjFactura.TipoDocto))); From b483069cf185f3d4a5e6143c4873ce71dfafcdfc Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Thu, 22 Feb 2024 13:33:27 -0700 Subject: [PATCH 09/16] --Bloqueo de precio para funcionalidad 109 --- Ventas/Ventas.aspx.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index e6cdac9b0..e067f3b54 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -8069,7 +8069,7 @@ Partial Class Ventas End If - If UsuarioActual.TienePermisoProceso(68) Then + If UsuarioActual.TienePermisoProceso(68) OrElse UsuarioActual.Empresa.Funcionalidad(109) = "1" Then e.Row.FCTextBox("TxtPrecio").Enabled = False e.Row.FCTextBox("TxtDescuento").Enabled = False End If @@ -24013,7 +24013,7 @@ Partial Class Ventas Dim PrecioCompra = ObjPS.GetUltimoPrecioCompra(UsuarioActual.CveEmpresa, GvRow.DataKey("CvePS").ToEntero()) If PrecioCompra > 0 Then HdnTotalCompra.Value = (PrecioCompra * GvRow.DataKey("Cantidad").ToDouble() * 1.16).ToString() - LblPrecioCompra.Text = $"PU Compra: {(PrecioCompra * 1.16).FormatoNumero(2)}" + LblPrecioCompra.Text = $"PU Compra: {(PrecioCompra).FormatoNumero(2)}" End If End Using From 24b46e554092c36c1a8c65284ddc53c6b4443b12 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Thu, 22 Feb 2024 15:59:16 -0700 Subject: [PATCH 10/16] --Recalcular el PU en el cambio de producto al editar --- Ventas/Ventas.aspx | 2 +- Ventas/Ventas.aspx.vb | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx index 227d61a28..fc15c914b 100644 --- a/Ventas/Ventas.aspx +++ b/Ventas/Ventas.aspx @@ -1256,7 +1256,7 @@ - + <%----%> <%----%> diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index 2af43e23a..f216d9802 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -17095,6 +17095,35 @@ Partial Class Ventas Protected Sub DdlPS_SelectedIndexChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles DdlPS.selectedindexchange DdlPSIndexChange(DdlPS.SelectedValue.ToEntero(), DdlPS) End Sub + + Protected Sub DdlPSEdit_SelectedIndexChanged(ByVal sender As Object, ByVal e As System.EventArgs) + If UsuarioActual.Empresa.Funcionalidad(109) = "1" Then + If GvPS.EditIndex >= 0 Then + Dim ddlPSEdit = DirectCast(sender, ADServerControl.Dropdownlost) + Dim GvRow = DirectCast(ddlPSEdit.NamingContainer, GridViewRow) + + If (GvRow.RowState = DataControlRowState.Edit OrElse GvRow.RowState = 5) Then + Dim CvePSParametro = ddlPSEdit.SelectedValue.ToEntero() + + Dim DrPS As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=CvePSParametro).FiltroPrimero("") + If DrPS IsNot Nothing Then + 'SUGIERE PRECIO + Dim PrecioSugerido As Decimal = 0 + Dim tPrecioSugerido As Decimal = 0 + tPrecioSugerido = DrPS("Precio").ToString().ToDecimal + Dim ObjPrecioSugerido As Modelos.MPrecioSugerido = CalculaPrecioSugerido(CvePSParametro, DrPS("CveClasificacion").ToString().ToEntero()) + + PrecioSugerido = ObjPrecioSugerido.PrecioSugerido + + If PrecioSugerido <= 0 Then PrecioSugerido = tPrecioSugerido + + GvRow.FCTextBox("TxtPrecio").Text = PrecioSugerido.ToString("#,###.####") ' que muestre hasta los 4 digitos si lo requiere + End If + End If + End If + End If + + End Sub Protected Sub DdlClasificacion_SelectedIndexChanged(sender As Object, e As System.EventArgs) Handles DdlClasificacion.SelectedIndexChanged CargaPS(DdlClasificacion.SelectedValue.ToEntero(), DdlPS) UpPS.Update() @@ -36985,5 +37014,6 @@ Partial Class Ventas End If End Sub + End Class From 272882dfdef7b710887f5a3346ce4f1826efb702 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Thu, 22 Feb 2024 17:37:18 -0700 Subject: [PATCH 11/16] =?UTF-8?q?FERRETERA.=20Descuentos,=20al=20especific?= =?UTF-8?q?arlos,=20el=20c=C3=A1lculo=20corregirlo,=20el=20IVA=20no=20most?= =?UTF-8?q?rarlo.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ventas/Ventas.aspx | 35 ++++++++++++++++++++--------------- Ventas/Ventas.aspx.vb | 33 ++++++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 20 deletions(-) diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx index fc15c914b..738a1010c 100644 --- a/Ventas/Ventas.aspx +++ b/Ventas/Ventas.aspx @@ -4336,6 +4336,7 @@
+ @@ -4350,16 +4351,16 @@ - + - + @@ -9752,28 +9753,32 @@ var PorcentajeDescuento = parseFloat($get("TxtPorPS").value); if (PorcentajeDescuento < 0 || PorcentajeDescuento > 99) { alert("No se puede aplicar ese porcentaje de descuento"); + $get("TxtPorPS").value = "0"; return; } + var ivaPor = parseFloat($get("HdnIVADescPS").value) ; var subTotal = parseFloat($get("LblSubtotalDescPS").innerText.replace(",", "").replace(",", "")); - var Monto = parseFloat($get("LblTotalDescPS").innerText.replace(",", "").replace(",", "")); - - var Total = Monto - ((Monto * PorcentajeDescuento) / 100); + + $get("LblDescPS").innerText = formato_numero(((subTotal * PorcentajeDescuento) / 100), 2, '.', ','); + + var descuento = parseFloat($get("LblDescPS").innerText.replace(",", "").replace(",", "")); + + $get("LblIVADescPS").innerText = formato_numero(((subTotal - descuento) * ivaPor), 2, '.', ','); + + var importeIVA =parseFloat($get("LblIVADescPS").innerText.replace(",", "").replace(",", "")); + + var Total = (subTotal - descuento) + importeIVA; $get("LblTotalFinalDescPS").innerText = formato_numero(Total, 2, '.', ','); - - var TotalRedondeado = parseFloat($get("LblTotalFinalDescPS").innerText.replace(",", "").replace(",", "")); - - var descuento = - ((TotalRedondeado - (subTotal * 1.16)) / 1.16); - - $get("LblIVADescPS").innerText = formato_numero(((subTotal - descuento) * 0.16), 2, '.', ','); - - $get("LblDescPS").innerText = formato_numero(descuento, 2, '.', ','); + $get("HdnDescPS").value = descuento; var totalCompra = parseFloat($get("HdnTotalCompra").value); if (totalCompra > 0) { - var utilidad = ((TotalRedondeado - totalCompra) / TotalRedondeado) * 100; + var totalRedondeado = parseFloat($get("LblTotalFinalDescPS").innerText.replace(",", "").replace(",", "")); + var utilidad = ((totalRedondeado - totalCompra) / totalRedondeado) * 100; + $get("LblUtilidadPorcentaje").innerText = formato_numero(utilidad, 2, '.', ','); } } diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index f216d9802..c78f926f4 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -24025,24 +24025,36 @@ Partial Class Ventas ElseIf e.CommandName = "Descuento" Then LblSubtotalDescPS.Text = "" LblTotalDescPS.Text = "" + LblTotalFinalDescPS.Text = "" + LblTituloDesc.Text = "Descuento" HdnConsecPS.Value = "-1" HdnTotalCompra.Value = "" TxtPorPS.Text = "" LblIVADescPS.Text = "" + LblUtilidadPorcentaje.Text = "" + HdnIVADescPS.Value = "0" Dim GvRow As GridViewRow = GvPS.Rows(e.CommandArgument.ToString().ToEntero()) LblTituloDesc.Text = $"Descuento: {GvRow.DataKey("PS")}" HdnConsecPS.Value = GvRow.DataKey("Consec") LblSubtotalDescPS.Text = (GvRow.DataKey("Total").ToDecimal()).FormatoNumero() LblTotalDescPS.Text = (GvRow.DataKey("Total").ToDecimal() + GvRow.DataKey("ImporteIVA").ToDecimal()).FormatoNumero() + LblTotalFinalDescPS.Text = (GvRow.DataKey("Total").ToDecimal() + GvRow.DataKey("ImporteIVA").ToDecimal()).FormatoNumero() LblIVADescPS.Text = GvRow.DataKey("ImporteIVA").FormatoNumero() + HdnIVADescPS.Value = GvRow.DataKey("IVA").FormatoNumero() Using ObjPS As New ClsProductosServicios Dim PrecioCompra = ObjPS.GetUltimoPrecioCompra(UsuarioActual.CveEmpresa, GvRow.DataKey("CvePS").ToEntero()) If PrecioCompra > 0 Then - HdnTotalCompra.Value = (PrecioCompra * GvRow.DataKey("Cantidad").ToDouble() * 1.16).ToString() + Dim TotalCompra = (PrecioCompra * GvRow.DataKey("Cantidad").ToDouble() * (1 + GvRow.DataKey("IVA").ToDecimal())) + HdnTotalCompra.Value = TotalCompra.ToString() LblPrecioCompra.Text = $"PU Compra: {(PrecioCompra).FormatoNumero(2)}" + + Dim TotalRedondeado = GvRow.DataKey("Total").ToDecimal() + GvRow.DataKey("ImporteIVA").ToDecimal() + + Dim PorUtilidad = ((TotalRedondeado - TotalCompra) / TotalRedondeado) * 100D + LblUtilidadPorcentaje.Text = PorUtilidad.FormatoNumero(2) End If End Using @@ -37003,11 +37015,22 @@ Partial Class Ventas If HdnDescPS.Value.ToEntero() > 0 Then Dim RowUpdate As DataRow = TmpDT.Select($"Consec = {HdnConsecPS.Value}").FirstOrDefault() If RowUpdate IsNot Nothing Then - RowUpdate("Descuento") = HdnDescPS.Value.ToDecimal() - RowUpdate("ImporteIVA") = LblIVADescPS.Text.ToDecimal() + If HdnDescPS.Value.ToDecimal().RoundSQL(2) < RowUpdate("Total").ToString().ToDecimal() Then + RowUpdate("Descuento") = HdnDescPS.Value.ToDecimal().RoundSQL(2) + + Dim TotalCalculableImpuestos = (RowUpdate("Cantidad").ToString().ToDecimal * RowUpdate("PU").ToString().ToDecimal) - RowUpdate("Descuento").ToString().ToDecimal() + Dim TotalCalculableImpuestosIVA As Decimal = (TotalCalculableImpuestos * (1 + RowUpdate("PorcentajeIEPS").ToString().ToDecimal)) + + Dim ImporteIVA = (RowUpdate("PorcentajeIVA").ToString().ToDouble * TotalCalculableImpuestosIVA).RoundSQL(NumeroDecimales) + + RowUpdate("ImporteIVA") = ImporteIVA + + CalculaTotalesVenta() + RegistraScript("$('#ModalDescPS').modal('hide');") + Else + Alert("El descuento no puede ser mayor o igual al total.", TipoMensaje.MsgAdvertencia) + End If - CalculaTotalesVenta() - RegistraScript("$('#ModalDescPS').modal('hide');") End If Else Alert("No se pudo aplicar el descuento", TipoMensaje.MsgAdvertencia) From c882b725ff528c5b4c788805829bb95ac72a2d26 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 22 Feb 2024 17:49:25 -0700 Subject: [PATCH 12/16] - --- Inventarios/EntregaAlmacenRuta.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Inventarios/EntregaAlmacenRuta.aspx.cs b/Inventarios/EntregaAlmacenRuta.aspx.cs index 80f18cafc..e47b0e3ad 100644 --- a/Inventarios/EntregaAlmacenRuta.aspx.cs +++ b/Inventarios/EntregaAlmacenRuta.aspx.cs @@ -349,7 +349,7 @@ public partial class Inventarios_EntregaAlmacenRuta : ClsPaginas { Timbres ObjTimbres = new Timbres("Rec", cvetimbre, UsuarioActual); - if (ObjTimbres.Timbrar()) + if (ObjTimbres.Timbrar(4)) { MensajeAlert.AppendFormat("Folio: {0}  ", ObjTimbres.ObjFactura.SerieFolio); From 14fe6aa1941923f3d5fe098ade25040eba559605 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Thu, 22 Feb 2024 18:03:17 -0700 Subject: [PATCH 13/16] --Ferretera. impresion directa en cobranza --- Ventas/PVCobranza.aspx | 4 + Ventas/PVCobranza.aspx.vb | 221 ++++++++++++++++++++++++-------------- 2 files changed, 146 insertions(+), 79 deletions(-) diff --git a/Ventas/PVCobranza.aspx b/Ventas/PVCobranza.aspx index 29768698d..820691846 100644 --- a/Ventas/PVCobranza.aspx +++ b/Ventas/PVCobranza.aspx @@ -815,7 +815,11 @@ +
% DescuentoDescuento  (%) IVA - +