diff --git a/App_Code/ClsContratos.vb b/App_Code/ClsContratos.vb index 87d41e011..90de7ccc0 100644 --- a/App_Code/ClsContratos.vb +++ b/App_Code/ClsContratos.vb @@ -335,7 +335,7 @@ Public Class ClsContratos Optional TipoGarantia As Integer = -1, Optional Folio As Integer = -1, Optional FechaVenc As Date = Nothing, Optional EstatusFianza As Integer = -1, Optional CvePeriodo As Integer = -1, Optional CveContratoPlantilla As Integer = -1, Optional CveCuentaEquipo As Integer = -1, Optional CveVendedor As Integer = -1, Optional Observaciones As String = "", Optional CveDireccionEnvio As Integer = -1, Optional AplicaImpuestosLocales As Boolean = False, Optional CorreoNotificacionPedDev As String = "", Optional FacturacionCicilica As Boolean = False, Optional FacturacionCiclicaAutomatico As Boolean = False, Optional DiaMesFacturacion As Integer = 1, Optional ObservacionesGenerales As String = "", - Optional CveTipoAF As Integer = Nothing, Optional CveChofer As Integer = Nothing, Optional CveChofer2 As Integer = Nothing, Optional CveAF As Integer = Nothing, Optional CantidadPasajeros As Integer = Nothing, Optional CveRuta As Integer = Nothing, Optional CvePartida As Integer = Nothing, Optional CveDestino As Integer = Nothing, Optional CveMasivo As Integer = Nothing) As Integer + Optional CveTipoAF As Integer = Nothing, Optional CveChofer As Integer = Nothing, Optional CveChofer2 As Integer = Nothing, Optional CveAF As Integer = Nothing, Optional CantidadPasajeros As Integer = Nothing, Optional CvePartida As Integer = Nothing, Optional CveDestino As Integer = Nothing, Optional CveMasivo As Integer = Nothing) As Integer Dim Retorno As Integer = -1 DataAdapter("PA_Con_ContratosAdd") @@ -396,8 +396,7 @@ Public Class ClsContratos .Add("@CveChofer", SqlDbType.Int).Value = CveChofer .Add("@CveChofer2", SqlDbType.Int).Value = CveChofer2 .Add("@CveAF", SqlDbType.Int).Value = CveAF - .Add("@CantidadPasajeros", SqlDbType.Int).Value = CantidadPasajeros - .Add("@CveRuta", SqlDbType.Int).Value = CveRuta + .Add("@CantidadPasajeros", SqlDbType.Int).Value = CantidadPasajeros .Add("@CvePartida", SqlDbType.Int).Value = CvePartida .Add("@CveDestino", SqlDbType.Int).Value = CveDestino .Add("@CveMasivo", SqlDbType.Int).Value = CveMasivo diff --git a/App_Code/Timbres.vb b/App_Code/Timbres.vb index 9770f9d03..dd3934601 100644 --- a/App_Code/Timbres.vb +++ b/App_Code/Timbres.vb @@ -626,13 +626,13 @@ Public Class Timbres Return Retorno End Function - Public Function Timbrar() As Boolean + Public Function Timbrar(Optional CvePACEspecifico As Integer = -1) As Boolean Dim Respuesta As Boolean = False Dim ObjTimbrado As New Timbrado - If ObjTimbrado.TimbrarFactura(UsuarioActual, ObjFactura) Then + If ObjTimbrado.TimbrarFactura(UsuarioActual, ObjFactura, CvePACEspecial:=CvePACEspecifico) Then Respuesta = True Else Respuesta = False diff --git a/Bin/ADSNetLibrary.7z b/Bin/ADSNetLibrary.7z deleted file mode 100644 index 91e95b751..000000000 Binary files a/Bin/ADSNetLibrary.7z and /dev/null differ diff --git a/Bin/Bin.rar b/Bin/Bin.rar deleted file mode 100644 index 5d8159013..000000000 Binary files a/Bin/Bin.rar and /dev/null differ diff --git a/Bin/Bin_20220223.rar b/Bin/Bin_20220223.rar deleted file mode 100644 index 1d4ea77ab..000000000 Binary files a/Bin/Bin_20220223.rar and /dev/null differ diff --git a/Bin/de/Microsoft.ReportViewer.Common.resources.dll b/Bin/de/Microsoft.ReportViewer.Common.resources.dll deleted file mode 100644 index dd9c8ed5b..000000000 Binary files a/Bin/de/Microsoft.ReportViewer.Common.resources.dll and /dev/null differ diff --git a/Bin/de/Microsoft.ReportViewer.DataVisualization.resources.dll b/Bin/de/Microsoft.ReportViewer.DataVisualization.resources.dll deleted file mode 100644 index 990d503d2..000000000 Binary files a/Bin/de/Microsoft.ReportViewer.DataVisualization.resources.dll and /dev/null differ diff --git a/Bin/de/Microsoft.ReportViewer.Design.resources.dll b/Bin/de/Microsoft.ReportViewer.Design.resources.dll deleted file mode 100644 index 313817ce9..000000000 Binary files a/Bin/de/Microsoft.ReportViewer.Design.resources.dll and /dev/null differ diff --git a/Bin/de/Microsoft.ReportViewer.WebDesign.resources.dll b/Bin/de/Microsoft.ReportViewer.WebDesign.resources.dll deleted file mode 100644 index 662e11c9d..000000000 Binary files a/Bin/de/Microsoft.ReportViewer.WebDesign.resources.dll and /dev/null differ diff --git a/Bin/de/Microsoft.ReportViewer.WebForms.resources.dll b/Bin/de/Microsoft.ReportViewer.WebForms.resources.dll deleted file mode 100644 index 68952abbd..000000000 Binary files a/Bin/de/Microsoft.ReportViewer.WebForms.resources.dll and /dev/null differ diff --git a/Bin/de/Microsoft.ReportViewer.WinForms.resources.dll b/Bin/de/Microsoft.ReportViewer.WinForms.resources.dll deleted file mode 100644 index a30ecbf2b..000000000 Binary files a/Bin/de/Microsoft.ReportViewer.WinForms.resources.dll and /dev/null differ diff --git a/Bin/es/Microsoft.ReportViewer.Common.resources.dll b/Bin/es/Microsoft.ReportViewer.Common.resources.dll index 1b42a78a3..46148f3c9 100644 Binary files a/Bin/es/Microsoft.ReportViewer.Common.resources.dll and b/Bin/es/Microsoft.ReportViewer.Common.resources.dll differ diff --git a/Bin/es/Microsoft.ReportViewer.DataVisualization.resources.dll b/Bin/es/Microsoft.ReportViewer.DataVisualization.resources.dll index 0b5bb4da4..aae634a35 100644 Binary files a/Bin/es/Microsoft.ReportViewer.DataVisualization.resources.dll and b/Bin/es/Microsoft.ReportViewer.DataVisualization.resources.dll differ diff --git a/Bin/es/Microsoft.ReportViewer.Design.resources.dll b/Bin/es/Microsoft.ReportViewer.Design.resources.dll index 968817034..910ec178f 100644 Binary files a/Bin/es/Microsoft.ReportViewer.Design.resources.dll and b/Bin/es/Microsoft.ReportViewer.Design.resources.dll differ diff --git a/Bin/es/Microsoft.ReportViewer.WebDesign.resources.dll b/Bin/es/Microsoft.ReportViewer.WebDesign.resources.dll index 12b73e755..3d6c17cff 100644 Binary files a/Bin/es/Microsoft.ReportViewer.WebDesign.resources.dll and b/Bin/es/Microsoft.ReportViewer.WebDesign.resources.dll differ diff --git a/Bin/es/Microsoft.ReportViewer.WebForms.resources.dll b/Bin/es/Microsoft.ReportViewer.WebForms.resources.dll index 797cbc032..d06338dd4 100644 Binary files a/Bin/es/Microsoft.ReportViewer.WebForms.resources.dll and b/Bin/es/Microsoft.ReportViewer.WebForms.resources.dll differ diff --git a/Bin/es/Microsoft.ReportViewer.WinForms.resources.dll b/Bin/es/Microsoft.ReportViewer.WinForms.resources.dll index b1bdcaaea..279cf82c7 100644 Binary files a/Bin/es/Microsoft.ReportViewer.WinForms.resources.dll and b/Bin/es/Microsoft.ReportViewer.WinForms.resources.dll differ diff --git a/Bin/fr/Microsoft.ReportViewer.Common.resources.dll b/Bin/fr/Microsoft.ReportViewer.Common.resources.dll deleted file mode 100644 index 91049cb67..000000000 Binary files a/Bin/fr/Microsoft.ReportViewer.Common.resources.dll and /dev/null differ diff --git a/Bin/fr/Microsoft.ReportViewer.DataVisualization.resources.dll b/Bin/fr/Microsoft.ReportViewer.DataVisualization.resources.dll deleted file mode 100644 index dbad2e340..000000000 Binary files a/Bin/fr/Microsoft.ReportViewer.DataVisualization.resources.dll and /dev/null differ diff --git a/Bin/fr/Microsoft.ReportViewer.Design.resources.dll b/Bin/fr/Microsoft.ReportViewer.Design.resources.dll deleted file mode 100644 index f7d07037d..000000000 Binary files a/Bin/fr/Microsoft.ReportViewer.Design.resources.dll and /dev/null differ diff --git a/Bin/fr/Microsoft.ReportViewer.WebDesign.resources.dll b/Bin/fr/Microsoft.ReportViewer.WebDesign.resources.dll deleted file mode 100644 index 591c43d61..000000000 Binary files a/Bin/fr/Microsoft.ReportViewer.WebDesign.resources.dll and /dev/null differ diff --git a/Bin/fr/Microsoft.ReportViewer.WebForms.resources.dll b/Bin/fr/Microsoft.ReportViewer.WebForms.resources.dll deleted file mode 100644 index 25152ed26..000000000 Binary files a/Bin/fr/Microsoft.ReportViewer.WebForms.resources.dll and /dev/null differ diff --git a/Bin/fr/Microsoft.ReportViewer.WinForms.resources.dll b/Bin/fr/Microsoft.ReportViewer.WinForms.resources.dll deleted file mode 100644 index 1c3c300f8..000000000 Binary files a/Bin/fr/Microsoft.ReportViewer.WinForms.resources.dll and /dev/null differ diff --git a/Bin/it/Microsoft.ReportViewer.Common.resources.dll b/Bin/it/Microsoft.ReportViewer.Common.resources.dll deleted file mode 100644 index 6c988969d..000000000 Binary files a/Bin/it/Microsoft.ReportViewer.Common.resources.dll and /dev/null differ diff --git a/Bin/it/Microsoft.ReportViewer.DataVisualization.resources.dll b/Bin/it/Microsoft.ReportViewer.DataVisualization.resources.dll deleted file mode 100644 index 0e90d96f1..000000000 Binary files a/Bin/it/Microsoft.ReportViewer.DataVisualization.resources.dll and /dev/null differ diff --git a/Bin/it/Microsoft.ReportViewer.Design.resources.dll b/Bin/it/Microsoft.ReportViewer.Design.resources.dll deleted file mode 100644 index 5964d0c4d..000000000 Binary files a/Bin/it/Microsoft.ReportViewer.Design.resources.dll and /dev/null differ diff --git a/Bin/it/Microsoft.ReportViewer.WebDesign.resources.dll b/Bin/it/Microsoft.ReportViewer.WebDesign.resources.dll deleted file mode 100644 index d3df12757..000000000 Binary files a/Bin/it/Microsoft.ReportViewer.WebDesign.resources.dll and /dev/null differ diff --git a/Bin/it/Microsoft.ReportViewer.WebForms.resources.dll b/Bin/it/Microsoft.ReportViewer.WebForms.resources.dll deleted file mode 100644 index 4458e3c91..000000000 Binary files a/Bin/it/Microsoft.ReportViewer.WebForms.resources.dll and /dev/null differ diff --git a/Bin/it/Microsoft.ReportViewer.WinForms.resources.dll b/Bin/it/Microsoft.ReportViewer.WinForms.resources.dll deleted file mode 100644 index e049170c1..000000000 Binary files a/Bin/it/Microsoft.ReportViewer.WinForms.resources.dll and /dev/null differ diff --git a/Bin/ko/Microsoft.ReportViewer.Common.resources.dll b/Bin/ko/Microsoft.ReportViewer.Common.resources.dll deleted file mode 100644 index b74a553de..000000000 Binary files a/Bin/ko/Microsoft.ReportViewer.Common.resources.dll and /dev/null differ diff --git a/Bin/ko/Microsoft.ReportViewer.DataVisualization.resources.dll b/Bin/ko/Microsoft.ReportViewer.DataVisualization.resources.dll deleted file mode 100644 index b3a2cd11d..000000000 Binary files a/Bin/ko/Microsoft.ReportViewer.DataVisualization.resources.dll and /dev/null differ diff --git a/Bin/ko/Microsoft.ReportViewer.Design.resources.dll b/Bin/ko/Microsoft.ReportViewer.Design.resources.dll deleted file mode 100644 index 662555151..000000000 Binary files a/Bin/ko/Microsoft.ReportViewer.Design.resources.dll and /dev/null differ diff --git a/Bin/ko/Microsoft.ReportViewer.WebDesign.resources.dll b/Bin/ko/Microsoft.ReportViewer.WebDesign.resources.dll deleted file mode 100644 index 42189b17a..000000000 Binary files a/Bin/ko/Microsoft.ReportViewer.WebDesign.resources.dll and /dev/null differ diff --git a/Bin/ko/Microsoft.ReportViewer.WebForms.resources.dll b/Bin/ko/Microsoft.ReportViewer.WebForms.resources.dll deleted file mode 100644 index 54fd0520b..000000000 Binary files a/Bin/ko/Microsoft.ReportViewer.WebForms.resources.dll and /dev/null differ diff --git a/Bin/ko/Microsoft.ReportViewer.WinForms.resources.dll b/Bin/ko/Microsoft.ReportViewer.WinForms.resources.dll deleted file mode 100644 index 4b2f747dd..000000000 Binary files a/Bin/ko/Microsoft.ReportViewer.WinForms.resources.dll and /dev/null differ diff --git a/Bin/pt/Microsoft.ReportViewer.Common.resources.dll b/Bin/pt/Microsoft.ReportViewer.Common.resources.dll deleted file mode 100644 index 76bb58f08..000000000 Binary files a/Bin/pt/Microsoft.ReportViewer.Common.resources.dll and /dev/null differ diff --git a/Bin/pt/Microsoft.ReportViewer.DataVisualization.resources.dll b/Bin/pt/Microsoft.ReportViewer.DataVisualization.resources.dll deleted file mode 100644 index 2850a8a5f..000000000 Binary files a/Bin/pt/Microsoft.ReportViewer.DataVisualization.resources.dll and /dev/null differ diff --git a/Bin/pt/Microsoft.ReportViewer.Design.resources.dll b/Bin/pt/Microsoft.ReportViewer.Design.resources.dll deleted file mode 100644 index eabf252d9..000000000 Binary files a/Bin/pt/Microsoft.ReportViewer.Design.resources.dll and /dev/null differ diff --git a/Bin/pt/Microsoft.ReportViewer.WebDesign.resources.dll b/Bin/pt/Microsoft.ReportViewer.WebDesign.resources.dll deleted file mode 100644 index 4702f3e40..000000000 Binary files a/Bin/pt/Microsoft.ReportViewer.WebDesign.resources.dll and /dev/null differ diff --git a/Bin/pt/Microsoft.ReportViewer.WebForms.resources.dll b/Bin/pt/Microsoft.ReportViewer.WebForms.resources.dll deleted file mode 100644 index 4e793007c..000000000 Binary files a/Bin/pt/Microsoft.ReportViewer.WebForms.resources.dll and /dev/null differ diff --git a/Bin/pt/Microsoft.ReportViewer.WinForms.resources.dll b/Bin/pt/Microsoft.ReportViewer.WinForms.resources.dll deleted file mode 100644 index 113cc97ce..000000000 Binary files a/Bin/pt/Microsoft.ReportViewer.WinForms.resources.dll and /dev/null differ diff --git a/Bin/ru/Microsoft.ReportViewer.Common.resources.dll b/Bin/ru/Microsoft.ReportViewer.Common.resources.dll deleted file mode 100644 index 56bb11879..000000000 Binary files a/Bin/ru/Microsoft.ReportViewer.Common.resources.dll and /dev/null differ diff --git a/Bin/ru/Microsoft.ReportViewer.DataVisualization.resources.dll b/Bin/ru/Microsoft.ReportViewer.DataVisualization.resources.dll deleted file mode 100644 index e655bb75b..000000000 Binary files a/Bin/ru/Microsoft.ReportViewer.DataVisualization.resources.dll and /dev/null differ diff --git a/Bin/ru/Microsoft.ReportViewer.Design.resources.dll b/Bin/ru/Microsoft.ReportViewer.Design.resources.dll deleted file mode 100644 index 8f48cd87b..000000000 Binary files a/Bin/ru/Microsoft.ReportViewer.Design.resources.dll and /dev/null differ diff --git a/Bin/ru/Microsoft.ReportViewer.WebDesign.resources.dll b/Bin/ru/Microsoft.ReportViewer.WebDesign.resources.dll deleted file mode 100644 index 048f9702a..000000000 Binary files a/Bin/ru/Microsoft.ReportViewer.WebDesign.resources.dll and /dev/null differ diff --git a/Bin/ru/Microsoft.ReportViewer.WebForms.resources.dll b/Bin/ru/Microsoft.ReportViewer.WebForms.resources.dll deleted file mode 100644 index f199d086d..000000000 Binary files a/Bin/ru/Microsoft.ReportViewer.WebForms.resources.dll and /dev/null differ diff --git a/Bin/ru/Microsoft.ReportViewer.WinForms.resources.dll b/Bin/ru/Microsoft.ReportViewer.WinForms.resources.dll deleted file mode 100644 index e00049bcd..000000000 Binary files a/Bin/ru/Microsoft.ReportViewer.WinForms.resources.dll and /dev/null differ diff --git a/Bin/zh-CHS/Microsoft.ReportViewer.Common.resources.dll b/Bin/zh-CHS/Microsoft.ReportViewer.Common.resources.dll deleted file mode 100644 index 466ba1eea..000000000 Binary files a/Bin/zh-CHS/Microsoft.ReportViewer.Common.resources.dll and /dev/null differ diff --git a/Bin/zh-CHS/Microsoft.ReportViewer.DataVisualization.resources.dll b/Bin/zh-CHS/Microsoft.ReportViewer.DataVisualization.resources.dll deleted file mode 100644 index 3c01b5bed..000000000 Binary files a/Bin/zh-CHS/Microsoft.ReportViewer.DataVisualization.resources.dll and /dev/null differ diff --git a/Bin/zh-CHS/Microsoft.ReportViewer.Design.resources.dll b/Bin/zh-CHS/Microsoft.ReportViewer.Design.resources.dll deleted file mode 100644 index fa8180b47..000000000 Binary files a/Bin/zh-CHS/Microsoft.ReportViewer.Design.resources.dll and /dev/null differ diff --git a/Bin/zh-CHS/Microsoft.ReportViewer.WebDesign.resources.dll b/Bin/zh-CHS/Microsoft.ReportViewer.WebDesign.resources.dll deleted file mode 100644 index d57eb4062..000000000 Binary files a/Bin/zh-CHS/Microsoft.ReportViewer.WebDesign.resources.dll and /dev/null differ diff --git a/Bin/zh-CHS/Microsoft.ReportViewer.WebForms.resources.dll b/Bin/zh-CHS/Microsoft.ReportViewer.WebForms.resources.dll deleted file mode 100644 index 5b58f404a..000000000 Binary files a/Bin/zh-CHS/Microsoft.ReportViewer.WebForms.resources.dll and /dev/null differ diff --git a/Bin/zh-CHS/Microsoft.ReportViewer.WinForms.resources.dll b/Bin/zh-CHS/Microsoft.ReportViewer.WinForms.resources.dll deleted file mode 100644 index bf953bc5b..000000000 Binary files a/Bin/zh-CHS/Microsoft.ReportViewer.WinForms.resources.dll and /dev/null differ diff --git a/Bin/zh-CHT/Microsoft.ReportViewer.Common.resources.dll b/Bin/zh-CHT/Microsoft.ReportViewer.Common.resources.dll deleted file mode 100644 index 20b45e20b..000000000 Binary files a/Bin/zh-CHT/Microsoft.ReportViewer.Common.resources.dll and /dev/null differ diff --git a/Bin/zh-CHT/Microsoft.ReportViewer.DataVisualization.resources.dll b/Bin/zh-CHT/Microsoft.ReportViewer.DataVisualization.resources.dll deleted file mode 100644 index e6e6ebff1..000000000 Binary files a/Bin/zh-CHT/Microsoft.ReportViewer.DataVisualization.resources.dll and /dev/null differ diff --git a/Bin/zh-CHT/Microsoft.ReportViewer.Design.resources.dll b/Bin/zh-CHT/Microsoft.ReportViewer.Design.resources.dll deleted file mode 100644 index 4a3ee6200..000000000 Binary files a/Bin/zh-CHT/Microsoft.ReportViewer.Design.resources.dll and /dev/null differ diff --git a/Bin/zh-CHT/Microsoft.ReportViewer.WebDesign.resources.dll b/Bin/zh-CHT/Microsoft.ReportViewer.WebDesign.resources.dll deleted file mode 100644 index 4e32784d5..000000000 Binary files a/Bin/zh-CHT/Microsoft.ReportViewer.WebDesign.resources.dll and /dev/null differ diff --git a/Bin/zh-CHT/Microsoft.ReportViewer.WebForms.resources.dll b/Bin/zh-CHT/Microsoft.ReportViewer.WebForms.resources.dll deleted file mode 100644 index c8f108dd3..000000000 Binary files a/Bin/zh-CHT/Microsoft.ReportViewer.WebForms.resources.dll and /dev/null differ diff --git a/Bin/zh-CHT/Microsoft.ReportViewer.WinForms.resources.dll b/Bin/zh-CHT/Microsoft.ReportViewer.WinForms.resources.dll deleted file mode 100644 index 5a8770065..000000000 Binary files a/Bin/zh-CHT/Microsoft.ReportViewer.WinForms.resources.dll and /dev/null differ diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb index f321aa17e..628062fd8 100644 --- a/Compras/Compras.aspx.vb +++ b/Compras/Compras.aspx.vb @@ -3293,7 +3293,7 @@ Partial Class Compras_Compras If RetIVAOriginal > 0 Then Dim CalRetIVAPor As Decimal = (RetIVAOriginal * 1 / SubTotal2Original).RoundAD(6).ToDecimal - If (CalRetIVAPor).RoundSQL(6) = 0.106667 OrElse (CalRetIVAPor).RoundSQL(6) = 0.053333 Then + If (CalRetIVAPor).RoundSQL(5) = 0.10666 OrElse (CalRetIVAPor).RoundSQL(5) = 0.05333 Then DdlRetIVAConcepto.SelectedValueExist("1") '10.66 servicios profesionales End If If RetIVAFlete Then '4 Fletes @@ -3314,6 +3314,7 @@ Partial Class Compras_Compras 'permitido en un margen de 1% a 2% If RetISRResico OrElse (CalRetISRPor >= 0.01 AndAlso CalRetISRPor <= 0.02) Then '1.25 Recico regimen simplificado confianza DdlRetISRConcepto.SelectedValueExist("3") + RetISRResico = True End If End If End If diff --git a/Empresas/186/Formatos/Factura.mrt b/Empresas/186/Formatos/Factura.mrt index b65cacf34..4ca383a79 100644 --- a/Empresas/186/Formatos/Factura.mrt +++ b/Empresas/186/Formatos/Factura.mrt @@ -1481,7 +1481,7 @@ Sello digital del SAT: 0,2.68,14.6,0.8 - Myriad Pro,9,Regular,Point,False,0 + Myriad Pro,8,Regular,Point,False,0 179a957f89d04921b856805a4c2e9d49 0,0,0,0 Text9 @@ -1542,7 +1542,7 @@ DESPUES DE 72 HORAS POSTERIORES A LA FECHA DE ELABORACIÓN" Factura 1/18/2024 9:39:09 AM 7/11/2022 2:49:19 PM - Factura.mrt + C:\inetpub\WWWSigGit\Empresas\186\Formatos\Factura.mrt 4a902ea660c34d0baeae36e92ea35edd Factura Centimeters diff --git a/Empresas/186/Formatos/Pedido.mrt b/Empresas/186/Formatos/Pedido.mrt index f009bae59..e40a5d04d 100644 --- a/Empresas/186/Formatos/Pedido.mrt +++ b/Empresas/186/Formatos/Pedido.mrt @@ -1056,7 +1056,7 @@ Fecha Cirugia: {FechaCirugia} 0,2.48,13.2,0.8 - Myriad Pro,9,Regular,Point,False,0 + Myriad Pro,8,Regular,Point,False,0 1891a87e013d48868bd75b5710529e30 0,0,0,0 Text13 diff --git a/Empresas/186/Formatos/Remision.mrt b/Empresas/186/Formatos/Remision.mrt index 71ce5fc92..632d2fdd1 100644 --- a/Empresas/186/Formatos/Remision.mrt +++ b/Empresas/186/Formatos/Remision.mrt @@ -1080,7 +1080,7 @@ Vendedor: {VendedorNombre} 0,2.48,10.6,1 - Myriad Pro,9,Regular,Point,False,0 + Myriad Pro,8,Regular,Point,False,0 fca703f575e74a9f8bc6628424c9a960 0,0,0,0 Text13 @@ -1138,7 +1138,7 @@ Episodio: {Episodio} Report 10/11/2022 8:18:55 PM 7/11/2022 2:49:19 PM - Remision.mrt + C:\inetpub\WWWSigGit\Empresas\186\Formatos\Remision.mrt 49b2dec77fe542ea952b501bf54fafb1 Report Centimeters diff --git a/Inventarios/TraspasoAlmacen.aspx.vb b/Inventarios/TraspasoAlmacen.aspx.vb index 34677b0fe..f26610ca8 100644 --- a/Inventarios/TraspasoAlmacen.aspx.vb +++ b/Inventarios/TraspasoAlmacen.aspx.vb @@ -1016,7 +1016,8 @@ Partial Class Inventarios_TraspasoAlmacen 'AGREGAMOS LA SALIDA DEL ALMACEN ORIGEN CveMovimientoSalida = ObjInventario.AddMovimiento(DdlAlmacenOrigen.SelectedValue.ToEntero, TipoMovimientoSalida, 1, Fecha, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, -1, -1, -1, Observaciones:=TxtObservaciones.Text.Trim, Recibio:=If(ChkTransitorio.Checked, TxtResponsable.Text.Trim, "-1"), - CveAlmacenDestino:=DdlAlmacenDestino.SelectedValue.ToEntero, GastoIndirecto:=If(ChkTransitorio.Checked And TxtGastoIndirecto.Text.ToDecimal > 0, TxtGastoIndirecto.Text, "-1").ToDecimal, ResponsableCarga:="", ResponsableRecibio:="", + CveAlmacenDestino:=DdlAlmacenDestino.SelectedValue.ToEntero, GastoIndirecto:=If(ChkTransitorio.Checked And TxtGastoIndirecto.Text.ToDecimal > 0, TxtGastoIndirecto.Text, "-1").ToDecimal, + ResponsableCarga:="", ResponsableRecibio:="", Modulo:="TA/G2", CveFolioGarantia:=CveFolioGarantia) FolioSalida = ObjInventario.Folio Folio = ObjInventario.Folio @@ -2754,7 +2755,7 @@ Partial Class Inventarios_TraspasoAlmacen MensajeAlert.Append("

") - If ObjTimbres.Timbrar() Then + If ObjTimbres.Timbrar(CvePACEspecifico:=4) Then Try PdfFactura(ObjTimbres.ObjFactura) @@ -3001,8 +3002,8 @@ Partial Class Inventarios_TraspasoAlmacen ProductosNoCargados.AppendFormat("{0},", RowPS("PSCodigo").ToString()) End If - Else - RowsNoCargados = RowsNoCargados + 1 + Else + RowsNoCargados = RowsNoCargados + 1 ProductosNoCargados.AppendFormat("{0},", RowExcel("Producto").ToString()) End If End If diff --git a/Transportes/RepContratoDetalle.aspx b/Transportes/RepContratoDetalle.aspx index 27625321e..a6ba710bb 100644 --- a/Transportes/RepContratoDetalle.aspx +++ b/Transportes/RepContratoDetalle.aspx @@ -10,7 +10,7 @@ @@ -26,163 +26,163 @@ <%-- Información General --%> - <%-- Datos del Contrato --%> -
-
-
- -
-
- Datos del Contrato -
-
- -
-
- - -
- -
- -
- - +
+
+ <%-- Datos del Contrato --%> +
+
+
+ +
+
+ Datos del Contrato +
-
-
- -
- - - - -
-
+
+
+ + +
-
- -
- -
-
+
+ +
+ + +
+
-
- -
- -
-
+
+ +
+ + + + +
+
-
- -
- - - - -
-
+
+ +
+ +
+
-
- -
- - - - -
-
+
+ +
+ +
+
-
- -
- - - - -
-
+
+ +
+ + + + +
+
-
- -
- - - - - -
-
+
+ +
+ + + + +
+
-
- -
- - -
-
+
+ +
+ + + + +
+
-
- -
- - -
-
+
+ +
+ + + + + +
+
-
- -
- - +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
- - - <%-- Pre init --%> - - - + + <%-- Boletos --%> diff --git a/Transportes/RepContratos.aspx.vb b/Transportes/RepContratos.aspx.vb index cb56f8656..7ad7c339e 100644 --- a/Transportes/RepContratos.aspx.vb +++ b/Transportes/RepContratos.aspx.vb @@ -19,8 +19,8 @@ Partial Class ListadoContratos End Property #End Region Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load - txtFechaI.Text = DateTime.Now.AddMonths(-1).ToString("MM/dd/yyyy").Replace(" ", "T") - txtFechaF.Text = DateTime.Now.AddDays(7).ToString("MM/dd/yyyy").Replace(" ", "T") + txtFechaI.Text = DateTime.Now.AddMonths(-1).ToShortDateString + txtFechaF.Text = DateTime.Now.AddDays(7).ToShortDateString If Not IsPostBack Then InicializaCombos() @@ -56,6 +56,7 @@ Partial Class ListadoContratos GvContratos.DataSource = ObjContratos.DtResultados GvContratos.DataBind() End If + ObjContratos.Dispose() 'Generamos Folio - NumeroContrato Dim CveSubProyecto As Integer = GlobalDTSubProyectos(-1, -1, CveEmpresa:=UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveSubProyecto", "TipoSucursal = 1").ToEntero diff --git a/Transportes/RepViajes.aspx.vb b/Transportes/RepViajes.aspx.vb index fa63cee2f..d7983b520 100644 --- a/Transportes/RepViajes.aspx.vb +++ b/Transportes/RepViajes.aspx.vb @@ -107,6 +107,7 @@ Partial Class ListadoViajes Protected Sub AddViaje(sender As Object, e As EventArgs) 'Generador de Viajes Masivos + Dim CveSubProyecto As Integer = DdlRutas.SelectedValue.ToEntero 'GlobalDTSubProyectos(-1, -1, CveEmpresa:=UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveSubProyecto", "TipoSucursal = 1").ToEntero If IsMasivo.Checked = True Then If TxtFechaInicial.Text = "" Or TxtFrecuencia.Text = "" Then Alert("Es necesario agregar la fecha inicial y la frecuencia", TipoMensaje.MsgAdvertencia) @@ -127,7 +128,6 @@ Partial Class ListadoViajes Dim ObjContratos As New ClsContratos 'Generamos folio - Dim CveSubProyecto As Integer = GlobalDTSubProyectos(-1, -1, CveEmpresa:=UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveSubProyecto", "TipoSucursal = 1").ToEntero If ObjFolio.GetFolios("Con", UsuarioActual.CveEmpresa, CveSubProyecto:=CveSubProyecto) Then If ObjFolio.DtResultados.Rows.Count > 0 Then Dim drr As DataRow = ObjFolio.DtResultados.FiltroPrimero("") @@ -136,7 +136,7 @@ Partial Class ListadoViajes End If 'Agregamos contrato ObjContratos.IniciaTransacSQL() - If ObjContratos.AddContratos(LbFolio.Text, "", "", UsuarioActual.CveProveedor, -1, -1, fecha, fecha, "", "", 10, -1, -1, -1, -1, "", "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, -1, -1, -1, -1, 0, CveContratoTipo:=35, CveContratosEstatus:=50, CveRuta:=DdlRutas.Text.ToEntero, CvePartida:=DdlPartida.SelectedValue.ToEntero, CveDestino:=DdlDestino.SelectedValue.ToEntero, CveMasivo:=CveMasivo, CveVendedor:=UsuarioActual.CveVendedor) > 0 Then + If ObjContratos.AddContratos(LbFolio.Text, "", "", UsuarioActual.CveProveedor, -1, -1, fecha, fecha, "", "", CveSubProyecto, -1, -1, -1, -1, "", "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, -1, -1, -1, -1, 0, CveContratoTipo:=35, CveContratosEstatus:=50, CvePartida:=DdlPartida.SelectedValue.ToEntero, CveDestino:=DdlDestino.SelectedValue.ToEntero, CveMasivo:=CveMasivo, CveVendedor:=UsuarioActual.CveVendedor) > 0 Then ObjContratos.Commit() End If 'Actualizamos Folio @@ -164,13 +164,13 @@ Partial Class ListadoViajes Try 'Agregamos Viaje If BtnGuardar.Text = "Agregar" Then - If ObjContratos.AddContratos(LbFolio.Text, "", "", UsuarioActual.CveProveedor, -1, -1, TxtFechaViaje.Text.ToDate, TxtFechaViaje.Text.ToDate, "", "", -1, -1, -1, -1, -1, "", "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, 0, 0, 0, 2, 0, CveContratoTipo:=35, CveContratosEstatus:=50, CvePartida:=DdlPartida.SelectedValue.ToEntero, CveDestino:=DdlDestino.SelectedValue.ToEntero) > 0 Then + If ObjContratos.AddContratos(LbFolio.Text, "", "", UsuarioActual.CveProveedor, -1, -1, TxtFechaViaje.Text.ToDate, TxtFechaViaje.Text.ToDate, "", "", CveSubProyecto, -1, -1, -1, -1, "", "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, 0, 0, 0, 2, 0, CveContratoTipo:=35, CveContratosEstatus:=50, CvePartida:=DdlPartida.SelectedValue.ToEntero, CveDestino:=DdlDestino.SelectedValue.ToEntero) > 0 Then ObjContratos.Commit() Alert("Viaje agregado correctamente.") End If Else 'Actualizamos Viaje - If ObjContratos.UpdateContratos(CveContrato.ToEntero, LbFolio.Text, "", "", UsuarioActual.CveProveedor, -1, -1, TxtFechaInicial.Text.ToDate, TxtFechaInicial.Text.ToDate, "", "", DdlRutas.SelectedValue.ToEntero, -1, -1, -1, -1, "", "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, -1, -1, -1, 2, 0, CveContratoTipo:=35, CveContratosEstatus:=50, CvePartida:=DdlPartida.SelectedValue.ToEntero, CveDestino:=DdlDestino.SelectedValue.ToEntero) = True Then + If ObjContratos.UpdateContratos(CveContrato.ToEntero, LbFolio.Text, "", "", UsuarioActual.CveProveedor, -1, -1, TxtFechaInicial.Text.ToDate, TxtFechaInicial.Text.ToDate, "", "", CveSubProyecto, -1, -1, -1, -1, "", "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, -1, -1, -1, 2, 0, CveContratoTipo:=35, CveContratosEstatus:=50, CvePartida:=DdlPartida.SelectedValue.ToEntero, CveDestino:=DdlDestino.SelectedValue.ToEntero) = True Then ObjContratos.Commit() Alert("El viaje se actualizó correctamente.") End If @@ -180,12 +180,8 @@ Partial Class ListadoViajes ObjContratos.RollBack() Finally 'Reiniciamos modal - DdlRutas.Text = "" TxtFechaViaje.Text = "" - DdlPartida.Text = "" - DdlDestino.SelectedValue = "" 'Actualizamos Folio - Dim CveSubProyecto As Integer = GlobalDTSubProyectos(-1, -1, CveEmpresa:=UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveSubProyecto", "TipoSucursal = 1").ToEntero Dim ObjFolios As New ClsGralFolios If ObjFolios.UpdateFolioActual(CveSubProyecto, "Con", True, UsuarioActual.CveEmpresa) Then ObjFolios.Dispose() diff --git a/Ventas/RepCancelacionesPorRespuesta.aspx.cs b/Ventas/RepCancelacionesPorRespuesta.aspx.cs index d10f9c911..8ae294174 100644 --- a/Ventas/RepCancelacionesPorRespuesta.aspx.cs +++ b/Ventas/RepCancelacionesPorRespuesta.aspx.cs @@ -545,7 +545,7 @@ public partial class Ventas_RepCancelacionesPorRespuesta : ClsPaginas CveEstatusFactura = -1; } - retorno = factura.CancelarPorRefacturacion(factura.CveMotivoCancelacion, factura.MotivoCancelacion, FolioSustitucion: FolioSustitucion, CveEstatusFacturaAsignado: CveEstatusFactura); + retorno = factura.CancelarPorRefacturacion(factura.CveMotivoCancelacion, factura.MotivoCancelacion, FolioSustitucion: FolioSustitucion, CveEstadoCancelacion: CveEstatusFactura); } else { diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index d15248b20..c6e1ba575 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -13319,14 +13319,26 @@ Partial Class Ventas End If End If - If UsuarioActual.Empresa.Funcionalidad(578) = "1" AndAlso EsVentaMedica AndAlso RBLTipoVenta.SelectedValue.ToEntero <> 2 Then + If UsuarioActual.Empresa.Funcionalidad(578) = "1" AndAlso EsVentaMedica Then + + CveAlmacenTraspasoDestino = CveAlmacenAsignado + + If RBLTipoVenta.SelectedValue.ToEntero = 2 Then + If Not ChkRequiereTecnico.Checked Then + CveAlmacenTraspasoDestino = GlobalDTAlmacen(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveAlmacen", $"CveTipoAlmacen = 10 AND CveSubProyecto = {DdlSubProyectoDatos.SelectedValue}").ToString().ToEntero() + End If + + If CveAlmacenTraspasoDestino <= 0 Then + ErrorList.Add("Ocurrió un error al seleccionar el almacen de entrega por adelantado.") + End If - If CveAlmacenAsignado <= 0 Then - ErrorList.Add("Ocurrió un error al seleccionar el almacen de resguardo del cliente.") Else - CveAlmacenTraspasoDestino = CveAlmacenAsignado + If CveAlmacenTraspasoDestino <= 0 Then + ErrorList.Add("Ocurrió un error al seleccionar el almacen de resguardo del cliente.") + End If End If + End If Dim TotalImpuestoLocal As Double = 0 @@ -13398,6 +13410,7 @@ Partial Class Ventas CveMedico = DdlMedico.SelectedValue.ToEntero CveProcedimiento = DdlProcedimiento.SelectedValue.ToEntero CveTipoVentaGuardar = If(SeEstaFActurandoVentaMedica, CveTipoVenta, RBLTipoVenta.SelectedValue.ToEntero) + 'CveAlmacenTraspasoDestino End If @@ -36415,7 +36428,7 @@ Partial Class Ventas DvModalRequiereOSFecha.Visible = True Case "2" ' Pago Directo ChkRequiereTecnicoModal.Checked = True - ChkRequiereTecnicoModal.Enabled = False + ChkRequiereTecnicoModal.Enabled = True DvModalRequiereOSFecha.Visible = True DvModalTipoVentaCliente.Visible = True Case "3" 'A-Vista @@ -36617,15 +36630,21 @@ Partial Class Ventas If RBLTipoVenta.SelectedValue.Contiene("2") Then 'si es pago directo es factura 'DdlTipoComprobante.SelectedValueExist("Ing") - DdlTipoComprobante.SelectedValueExist("Ped") TrVentasMedicas1.Visible = True TrVentasMedicas2.Visible = True TdFechaOS1.Visible = True TdFechaOS2.Visible = True - ChkRequiereTecnico.Checked = True - ChkRequiereTecnico.Enabled = False + ChkRequiereTecnico.Checked = ChkRequiereTecnicoModal.Checked + ChkRequiereTecnico.Enabled = True + + If ChkRequiereTecnico.Checked Then + DdlTipoComprobante.SelectedValueExist("Ped") + Else + DdlTipoComprobante.SelectedValueExist("Rem") + End If + ElseIf RBLTipoVenta.SelectedValue.Contiene("3") Then ' A vista DdlTipoComprobante.Items.Insert(DdlTipoComprobante.Items.Count, New ListItem("Pedido", "Ped"))